Merge pull request scylladb#827 from datastax/python-close-dispatchers

beltran · web-flow · commit 79947ba6ecdf · 2017-09-21T13:06:03.000-04:00
The asyncore event loop shouldn't be awoken once closed, call manuall…
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -11,6 +11,7 @@ Bug Fixes
 * Use of DCAwareRoundRobinPolicy raises NoHostAvailable exception (PYTHON-781)
 * Not create two sessions by default in CQLEngine (PYTHON-814)
 * Bug when subclassing AyncoreConnection (PYTHON-827)
+* Error at cleanup when closing the asyncore connections (PYTHON-829)
 
 3.11.0
 ======
diff --git a/cassandra/io/asyncorereactor.py b/cassandra/io/asyncorereactor.py
@@ -279,6 +279,9 @@ def _cleanup(self):
         if not self._thread:
             return
 
+        # The loop shouldn't be woken up from here onwards since it won't be running
+        self._loop_dispatcher._notified = True
+
         log.debug("Waiting for event loop thread to join...")
         self._thread.join(timeout=1.0)
         if self._thread.is_alive():
@@ -288,9 +291,12 @@ def _cleanup(self):
 
         log.debug("Event loop thread was joined")
 
-        # Ensure all connections are closed and  in-flight requests cancelled
+        # Ensure all connections are closed and in-flight requests cancelled
         for conn in tuple(_dispatcher_map.values()):
             conn.close()
+        # The event loop should be closed, so we call remaining asyncore.close
+        # callbacks from here
+        self._timers.service_timeouts()
 
         log.debug("Dispatchers were closed")
 
