Change BufferUnderflowError to ConnectionError in conn._read_bytes()

Both errors are handled the same way when raised and caught, so this makes sense.

Author: rdiomar

kafka/client.py

@@ -3,11 +3,10 @@
 from functools import partial
 from itertools import count
 import logging
-import socket
 import time
 
 from kafka.common import (
-    ErrorMapping, TopicAndPartition, BufferUnderflowError, ConnectionError,
+    ErrorMapping, TopicAndPartition, ConnectionError,
     FailedPayloadsException
 )
 from kafka.conn import KafkaConnection
@@ -175,7 +174,7 @@ def _send_broker_aware_request(self, payloads, encoder_fn, decoder_fn):
                     continue
                 try:
                     response = conn.recv(requestId)
-                except (ConnectionError, BufferUnderflowError), e:
+                except ConnectionError, e:
                     log.warning("Could not receive response to request [%s] "
                                 "from server %s: %s", request, conn, e)
                     failed = True

kafka/conn.py

@@ -4,7 +4,6 @@
 import struct
 from threading import local
 
-from kafka.common import BufferUnderflowError
 from kafka.common import ConnectionError
 
 log = logging.getLogger("kafka")
@@ -53,8 +52,8 @@ def _read_bytes(self, num_bytes):
                 log.error('Unable to receive data from Kafka: %s', e)
                 self._raise_connection_error()
             if data == '':
-                self._dirty = True
-                raise BufferUnderflowError("Not enough data to read this response")
+                log.error("Not enough data to read this response")
+                self._raise_connection_error()
             bytes_left -= len(data)
             log.debug("Read %d/%d bytes from Kafka", num_bytes - bytes_left, num_bytes)
             resp += data