1

Author: dkropachev

cassandra/cluster.py

@@ -4237,6 +4237,7 @@ def wait_for_schema_agreement(self, connection=None, preloaded_results=None, wai
             cl = ConsistencyLevel.ONE
             schema_mismatches = None
             select_peers_query = self._get_peers_query(self.PeersQueryType.PEERS_SCHEMA, current_connection)
+            error_signaled = False
 
             while elapsed < total_timeout:
                 current_connection = connection or self._connection
@@ -4258,7 +4259,9 @@ def wait_for_schema_agreement(self, connection=None, preloaded_results=None, wai
                     if self._is_shutdown:
                         log.debug("[control connection] Aborting wait for schema match due to shutdown")
                         return None
-                    else:
+                    elif not error_signaled:
+                        self._signal_error()
+                        error_signaled = True
                         continue
 
                 schema_mismatches = self._get_schema_mismatches(peers_result, local_result, current_connection.endpoint)