From 2fb6e23b32d4369918fd2d3d9f41677f2c0eb3c9 Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Tue, 23 Sep 2014 14:12:30 -0700 Subject: [PATCH] Resolve merge conflict in PR #225 --- kafka/consumer/simple.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kafka/consumer/simple.py b/kafka/consumer/simple.py index dcc71a9d7..b74924bc9 100644 --- a/kafka/consumer/simple.py +++ b/kafka/consumer/simple.py @@ -305,7 +305,7 @@ def _fetch(self): if self.max_buffer_size is None: buffer_size *= 2 else: - buffer_size = max(buffer_size * 2, + buffer_size = min(buffer_size * 2, self.max_buffer_size) log.warn("Fetch size too small, increase to %d (2x) " "and retry", buffer_size)