Merge pull request #721 from smukil/fix_msg_leak_for_each_safe_quorum

Fix msg leak with DC_EACH_SAFE_QUORUM
Netflix · Oct 16, 2019 · 7747c05 · 7747c05
2 parents d5c1032 + 4997f26
commit 7747c05
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/dyn_client.c b/src/dyn_client.c
@@ -655,10 +655,8 @@ rstatus_t req_forward_to_peer(struct context *ctx, struct conn *c_conn,
   }
 
   if (!(same_dc && same_rack) || force_swallow) {
-    if (req->consistency != DC_EACH_SAFE_QUORUM || force_swallow) {
-      // Swallow responses from remote racks or DCs.
-      rack_msg->swallow = true;
-    }
+    // Swallow responses from remote racks or DCs.
+    rack_msg->swallow = true;
   }
 
   // Get a connection to the node.