Merge pull request apache#779 from datastax/python-767

aboudreault · web-flow · commit 8e67b91ca9ec · 2017-06-07T07:50:37.000-04:00
Ensure asyncore dispatchers are closed on shutdown
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,7 @@
 Bug Fixes
 ---------
 * is_idempotent flag is not propagated from PreparedStatement to BoundStatement (PYTHON-736)
+* Fix asyncore hang on exit (PYTHON-767)
 
 Other
 -----
diff --git a/cassandra/io/asyncorereactor.py b/cassandra/io/asyncorereactor.py
@@ -240,6 +240,8 @@ def add_timer(self, timer):
         self._timers.add_timer(timer)
 
     def _cleanup(self):
+        global _dispatcher_map
+
         self._shutdown = True
         if not self._thread:
             return
@@ -253,6 +255,12 @@ def _cleanup(self):
 
         log.debug("Event loop thread was joined")
 
+        # Ensure all connections are closed and  in-flight requests cancelled
+        for conn in tuple(_dispatcher_map.values()):
+            conn.close()
+
+        log.debug("Dispatchers were closed")
+
 
 class AsyncoreConnection(Connection, asyncore.dispatcher):
     """
@@ -326,7 +334,7 @@ def close(self):
             #This happens when the connection is shutdown while waiting for the ReadyMessage
             if not self.connected_event.is_set():
                 self.last_error = ConnectionShutdown("Connection to %s was closed" % self.host)
-                
+
             # don't leave in-progress operations hanging
             self.connected_event.set()
 
