Merge pull request apache#716 from datastax/python-673

aboudreault · web-flow · commit 727389c98475 · 2017-03-16T10:52:41.000-04:00
PYTHON-673: Ensure Evenlet greenthreads exit gracefully
diff --git a/cassandra/io/eventletreactor.py b/cassandra/io/eventletreactor.py
@@ -19,6 +19,7 @@
 import eventlet
 from eventlet.green import socket
 from eventlet.queue import Queue
+from greenlet import GreenletExit
 import logging
 from threading import Event
 import time
@@ -80,7 +81,6 @@ def service_timeouts(cls):
 
     def __init__(self, *args, **kwargs):
         Connection.__init__(self, *args, **kwargs)
-
         self._write_queue = Queue()
 
         self._connect_socket()
@@ -126,6 +126,8 @@ def handle_write(self):
                 log.debug("Exception during socket send for %s: %s", self, err)
                 self.defunct(err)
                 return  # Leave the write loop
+            except GreenletExit:  # graceful greenthread exit
+                return
 
     def handle_read(self):
         while True:
@@ -137,6 +139,8 @@ def handle_read(self):
                           self, err)
                 self.defunct(err)
                 return  # leave the read loop
+            except GreenletExit:  # graceful greenthread exit
+                return
 
             if buf and self._iobuf.tell():
                 self.process_io_buffer()
