From ee224e7f08c21983f5712771d35c0eff3948632f Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Thu, 11 Jan 2018 14:21:01 -0800 Subject: [PATCH 1/2] Honor reconnect_backoff in conn.connect() --- kafka/conn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kafka/conn.py b/kafka/conn.py index 1243bdba6..f30d987e8 100644 --- a/kafka/conn.py +++ b/kafka/conn.py @@ -278,7 +278,7 @@ def _next_afi_host_port(self): def connect(self): """Attempt to connect and return ConnectionState""" - if self.state is ConnectionStates.DISCONNECTED: + if self.state is ConnectionStates.DISCONNECTED and not self.blacked_out(): self.last_attempt = time.time() next_lookup = self._next_afi_host_port() if not next_lookup: From 0906bae646d18a41ff4df3acdc11b2d0b2aaf390 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Thu, 11 Jan 2018 15:45:35 -0800 Subject: [PATCH 2/2] Reset last_attempt in conn connect tests --- test/test_conn.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_conn.py b/test/test_conn.py index ef7925a1b..56985190a 100644 --- a/test/test_conn.py +++ b/test/test_conn.py @@ -263,6 +263,7 @@ def test_lookup_on_connect(): ] with mock.patch("socket.getaddrinfo", return_value=mock_return2) as m: + conn.last_attempt = 0 conn.connect() m.assert_called_once_with(hostname, port, 0, 1) conn.close() @@ -288,6 +289,7 @@ def test_relookup_on_failure(): ] with mock.patch("socket.getaddrinfo", return_value=mock_return2) as m: + conn.last_attempt = 0 conn.connect() m.assert_called_once_with(hostname, port, 0, 1) conn.close()