summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Powers <dana.powers@gmail.com>2015-12-02 14:19:27 -0800
committerDana Powers <dana.powers@gmail.com>2015-12-02 14:19:27 -0800
commitcdcaea6f944df10941522ebcb08946bf34c357db (patch)
treebc642fc826a5c8acc1c988e5ececb4d1bbcd550e
parent2eca5538eef948ef3828be5c3cb5c78c1c958f6f (diff)
parent64cda819d9e87634b075725321b729aeede8471a (diff)
downloadkafka-python-cdcaea6f944df10941522ebcb08946bf34c357db.tar.gz
Merge pull request #467 from bschopman/master
Prevents crashing communication thread of async producer
-rw-r--r--kafka/client.py6
-rw-r--r--kafka/producer/base.py5
2 files changed, 9 insertions, 2 deletions
diff --git a/kafka/client.py b/kafka/client.py
index 13777a4..c05e142 100644
--- a/kafka/client.py
+++ b/kafka/client.py
@@ -478,7 +478,11 @@ class KafkaClient(object):
else:
decoder = KafkaProtocol.decode_produce_response
- resps = self._send_broker_aware_request(payloads, encoder, decoder)
+ try:
+ resps = self._send_broker_aware_request(payloads, encoder, decoder)
+ except Exception:
+ if fail_on_error:
+ raise
return [resp if not callback else callback(resp) for resp in resps
if resp is not None and
diff --git a/kafka/producer/base.py b/kafka/producer/base.py
index bfbdcf8..8774c66 100644
--- a/kafka/producer/base.py
+++ b/kafka/producer/base.py
@@ -186,7 +186,10 @@ def _send_upstream(queue, client, codec, batch_time, batch_size,
# refresh topic metadata before next retry
if retry_state['do_refresh']:
log.warn('Async producer forcing metadata refresh metadata before retrying')
- client.load_metadata_for_topics()
+ try:
+ client.load_metadata_for_topics()
+ except Exception as e:
+ log.error("Async producer couldn't reload topic metadata. Error: `%s`", e.message)
# Apply retry limit, dropping messages that are over
request_tries = dict(