handle unexpected reads in client_async

Should fix #661.

1 files changed, 19 insertions, 0 deletions

diff --git a/kafka/client_async.py b/kafka/client_async.py
index ea2621e..6f5d1fe 100644
--- a/kafka/client_async.py
+++ b/kafka/client_async.py
@@ -448,6 +448,25 @@ class KafkaClient(object):
                 continue
             conn = key.data
             processed.add(conn)
+
+            if not conn.in_flight_requests:
+                # if we got an EVENT_READ but there were no in-flight requests, one of
+                # two things has happened:
+                #
+                # 1. The remote end closed the connection (because it died, or because
+                #    a firewall timed out, or whatever)
+                # 2. The protocol is out of sync.
+                #
+                # either way, we can no longer safely use this connection
+                #
+                # Do a 1-byte read to clear the READ flag, and then close the conn
+                unexpected_data = key.fileobj.recv(1)
+                if unexpected_data:  # anything other than a 0-byte read means protocol issues
+                    log.warning('Protocol out of sync on %r, closing', conn)
+                conn.close()
+                continue
+
+            # Accumulate as many responses as the connection has pending
             while conn.in_flight_requests:
                 response = conn.recv() # Note: conn.recv runs callbacks / errbacks