AER-5911 - Fixed race caused by recycling duplicate resolution (desti…

…nation) fabric message for replica write/ping.
aerospike · Jul 31, 2018 · 4235aa3 · 4235aa3
1 parent 9fa1024
commit 4235aa3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/as/src/transaction/replica_write.c b/as/src/transaction/replica_write.c
@@ -74,12 +74,11 @@ void
 repl_write_make_message(rw_request* rw, as_transaction* tr)
 {
 	if (rw->dest_msg) {
-		msg_reset(rw->dest_msg);
-	}
-	else {
-		rw->dest_msg = as_fabric_msg_get(M_TYPE_RW);
+		as_fabric_msg_put(rw->dest_msg);
 	}
 
+	rw->dest_msg = as_fabric_msg_get(M_TYPE_RW);
+
 	// TODO - remove this when we're comfortable:
 	cf_assert(rw->pickled_buf, AS_RW, "making repl-write msg with null pickle");