Merge branch 'dcrt_rethrow_write_timeout' into 338

aholmberg · aholmberg · commit be479b95d6a7 · 2015-07-16T15:50:44.000-05:00
diff --git a/cassandra/policies.py b/cassandra/policies.py
@@ -816,7 +816,7 @@ def on_write_timeout(self, query, consistency, write_type,
                          required_responses, received_responses, retry_num):
         if retry_num != 0:
             return (self.RETHROW, None)
-        elif write_type in (WriteType.SIMPLE, WriteType.BATCH, WriteType.COUNTER):
+        elif write_type in (WriteType.SIMPLE, WriteType.BATCH, WriteType.COUNTER) and received_responses > 0:
             return (self.IGNORE, None)
         elif write_type == WriteType.UNLOGGED_BATCH:
             return self._pick_consistency(received_responses)
diff --git a/tests/unit/test_policies.py b/tests/unit/test_policies.py
@@ -1052,6 +1052,14 @@ def test_write_timeout(self):
         self.assertEqual(retry, RetryPolicy.RETHROW)
         self.assertEqual(consistency, None)
 
+	    # On these type of writes failures should not be ignored
+        # if received_responses is 0
+        for write_type in (WriteType.SIMPLE, WriteType.BATCH, WriteType.COUNTER):
+            retry, consistency = policy.on_write_timeout(
+                query=None, consistency=ONE, write_type=write_type,
+                required_responses=1, received_responses=0, retry_num=0)
+            self.assertEqual(retry, RetryPolicy.RETHROW)
+
         # ignore failures on these types of writes
         for write_type in (WriteType.SIMPLE, WriteType.BATCH, WriteType.COUNTER):
             retry, consistency = policy.on_write_timeout(
