openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Don't wait for schema agreement during startup.

Browse Source 
Fixes an issue where connect will stall when connecting to mixed version
clusters.
Should not affect model consistency since we are already registered for
schema_change events.
This commit is contained in:
Adam Holmberg
2015-06-10 11:18:50 -05:00
parent b48944ec61
commit 04b69b96d3
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cassandra/cluster.py
View File

@@ -2118,7 +2118,7 @@ class ControlConnection(object):
peers_query, local_query, timeout=self._timeout)
self._refresh_node_list_and_token_map(connection, preloaded_results=shared_results)
self._refresh_schema(connection, preloaded_results=shared_results)
self._refresh_schema(connection, preloaded_results=shared_results, schema_agreement_wait=-1)
if not self._cluster.metadata.keyspaces:
log.warning("[control connection] No schema built on connect; retrying without wait for schema agreement")
self._refresh_schema(connection, preloaded_results=shared_results, schema_agreement_wait=0)

5
tests/integration/standard/test_cluster.py
View File

@@ -336,10 +336,7 @@ class ClusterTests(unittest.TestCase):
# cluster agreement wait exceeded
c = Cluster(protocol_version=PROTOCOL_VERSION, max_schema_agreement_wait=agreement_timeout)
start_time = time.time()
s = c.connect()
end_time = time.time()
self.assertGreaterEqual(end_time - start_time, agreement_timeout)
c.connect()
self.assertTrue(c.metadata.keyspaces)
# cluster agreement wait used for refresh