Timeout schema agreement check queries

thobbs · thobbs · commit 6ed86099ecb4 · 2013-11-06T15:43:48.000-06:00
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -1489,10 +1489,18 @@ def wait_for_schema_agreement(self, connection=None):
             start = self._time.time()
             elapsed = 0
             cl = ConsistencyLevel.ONE
-            while elapsed < self._cluster.max_schema_agreement_wait:
+            total_timeout = self._cluster.max_schema_agreement_wait
+            while elapsed < total_timeout:
                 peers_query = QueryMessage(query=self._SELECT_SCHEMA_PEERS, consistency_level=cl)
                 local_query = QueryMessage(query=self._SELECT_SCHEMA_LOCAL, consistency_level=cl)
-                peers_result, local_result = connection.wait_for_responses(peers_query, local_query)
+                try:
+                    timeout = min(2.0, total_timeout - elapsed)
+                    peers_result, local_result = connection.wait_for_responses(peers_query, local_query, timeout=timeout)
+                except OperationTimedOut:
+                    log.debug("[control connection] Timed out waiting for response during schema agreement check")
+                    elapsed = self._time.time() - start
+                    continue
+
                 peers_result = dict_factory(*peers_result.results)
 
                 versions = set()
diff --git a/tests/unit/test_control_connection.py b/tests/unit/test_control_connection.py
@@ -87,7 +87,7 @@ def __init__(self):
              ["192.168.1.2", "10.0.0.2", "a", "dc1", "rack1", ["2", "102", "202"]]]
         ]
 
-    def wait_for_responses(self, peer_query, local_query):
+    def wait_for_responses(self, peer_query, local_query, timeout=None):
         local_response = ResultMessage(
             kind=ResultMessage.KIND_ROWS, results=self.local_results)
         peer_response = ResultMessage(

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ def __init__(self):`
`87`	`87`	`["192.168.1.2", "10.0.0.2", "a", "dc1", "rack1", ["2", "102", "202"]]]`
`88`	`88`	`]`
`89`	`89`
`90`		`- def wait_for_responses(self, peer_query, local_query):`
	`90`	`+ def wait_for_responses(self, peer_query, local_query, timeout=None):`
`91`	`91`	`local_response = ResultMessage(`
`92`	`92`	`kind=ResultMessage.KIND_ROWS, results=self.local_results)`
`93`	`93`	`peer_response = ResultMessage(`