Don't check for schema agreement when shutdown

thobbs · thobbs · commit d5265bd8b4a6 · 2013-11-26T17:57:09.000-06:00
This avoids some unneeded noise in debug logs when shutting down a
Cluster.
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -1201,6 +1201,7 @@ class ControlConnection(object):
 
     # for testing purposes
     _time = time
+    _is_shutdown = False
 
     def __init__(self, cluster):
         # use a weak reference to allow the Cluster instance to be GC'ed (and
@@ -1217,8 +1218,6 @@ def __init__(self, cluster):
         self._reconnection_handler = None
         self._reconnection_lock = RLock()
 
-        self._is_shutdown = False
-
     def connect(self):
         if self._is_shutdown:
             return
@@ -1490,6 +1489,9 @@ def wait_for_schema_agreement(self, connection=None):
         # a lock is just a simple way to cut down on the number of schema queries
         # we'll make.
         with self._schema_agreement_lock:
+            if self._is_shutdown:
+                return
+
             log.debug("[control connection] Waiting for schema agreement")
             if not connection:
                 connection = self._connection
