From ecb4d49c06484e8ed9bdb6db35350d104e13b730 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Sun, 10 Jan 2016 19:56:00 -0800 Subject: Pass consumer timeout to client.poll() in iterator; check timeout before iterating fetcher --- kafka/consumer/group.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'kafka') diff --git a/kafka/consumer/group.py b/kafka/consumer/group.py index c6beb25..704c994 100644 --- a/kafka/consumer/group.py +++ b/kafka/consumer/group.py @@ -628,11 +628,14 @@ class KafkaConsumer(six.Iterator): # init any new fetches (won't resend pending fetches) self._fetcher.init_fetches() - self._client.poll() + self._client.poll( + max(0, self._consumer_timeout - time.time()) * 1000) timeout_at = min(self._consumer_timeout, self._client._delayed_tasks.next_at() + time.time(), self._client.cluster.ttl() / 1000.0 + time.time()) + if time.time() > timeout_at: + continue for msg in self._fetcher: yield msg if time.time() > timeout_at: -- cgit v1.2.1