From 3e7f494a77c6cc6a83a9d4f3bc7bd32a7f9af3dd Mon Sep 17 00:00:00 2001 From: Dmitry Kropachev Date: Fri, 28 Mar 2025 07:34:41 -0400 Subject: [PATCH] Revert "Make schema agreement waiting code renew connection on each iteration" This reverts commit 23a6e855b65102e19e7a3776041770e363d3b563. --- cassandra/cluster.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cassandra/cluster.py b/cassandra/cluster.py index 17e113e7aa..fd73803eb8 100644 --- a/cassandra/cluster.py +++ b/cassandra/cluster.py @@ -4206,7 +4206,7 @@ def _handle_schema_change(self, event): delay = self._delay_for_event_type('schema_change', self._schema_event_refresh_window) self._cluster.scheduler.schedule_unique(delay, self.refresh_schema, **event) - def wait_for_schema_agreement(self, target_connection=None, preloaded_results=None, wait_time=None): + def wait_for_schema_agreement(self, connection=None, preloaded_results=None, wait_time=None): total_timeout = wait_time if wait_time is not None else self._cluster.max_schema_agreement_wait if total_timeout <= 0: @@ -4220,7 +4220,8 @@ def wait_for_schema_agreement(self, target_connection=None, preloaded_results=No if self._is_shutdown: return - connection = target_connection or self._connection + if not connection: + connection = self._connection if preloaded_results: 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 select_peers_query = self._get_peers_query(self.PeersQueryType.PEERS_SCHEMA, connection) while elapsed < total_timeout: - connection = target_connection or self._connection - peers_query = QueryMessage(query=maybe_add_timeout_to_query(select_peers_query, self._metadata_request_timeout), consistency_level=cl) local_query = QueryMessage(query=maybe_add_timeout_to_query(self._SELECT_SCHEMA_LOCAL, self._metadata_request_timeout),