Skip to content

Commit 2354c82

Browse files
committed
Revert "Make schema agreement waiting code renew connection on each iteration"
This reverts commit 23a6e85.
1 parent 23a6e85 commit 2354c82

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

cassandra/cluster.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -4206,7 +4206,7 @@ def _handle_schema_change(self, event):
42064206
delay = self._delay_for_event_type('schema_change', self._schema_event_refresh_window)
42074207
self._cluster.scheduler.schedule_unique(delay, self.refresh_schema, **event)
42084208

4209-
def wait_for_schema_agreement(self, target_connection=None, preloaded_results=None, wait_time=None):
4209+
def wait_for_schema_agreement(self, connection=None, preloaded_results=None, wait_time=None):
42104210

42114211
total_timeout = wait_time if wait_time is not None else self._cluster.max_schema_agreement_wait
42124212
if total_timeout <= 0:
@@ -4220,7 +4220,8 @@ def wait_for_schema_agreement(self, target_connection=None, preloaded_results=No
42204220
if self._is_shutdown:
42214221
return
42224222

4223-
connection = target_connection or self._connection
4223+
if not connection:
4224+
connection = self._connection
42244225

42254226
if preloaded_results:
42264227
log.debug("[control connection] Attempting to use preloaded results for schema agreement")
@@ -4239,8 +4240,6 @@ def wait_for_schema_agreement(self, target_connection=None, preloaded_results=No
42394240
select_peers_query = self._get_peers_query(self.PeersQueryType.PEERS_SCHEMA, connection)
42404241

42414242
while elapsed < total_timeout:
4242-
connection = target_connection or self._connection
4243-
42444243
peers_query = QueryMessage(query=maybe_add_timeout_to_query(select_peers_query, self._metadata_request_timeout),
42454244
consistency_level=cl)
42464245
local_query = QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_SCHEMA_LOCAL, self._metadata_request_timeout),

0 commit comments

Comments
 (0)