summaryrefslogtreecommitdiff
path: root/kafka/coordinator
diff options
context:
space:
mode:
authorDana Powers <dana.powers@gmail.com>2018-11-10 12:45:01 -0800
committerGitHub <noreply@github.com>2018-11-10 12:45:01 -0800
commit0a2ccba3cb1b8636f615a30821123720773a8dfa (patch)
tree41c244e136c3f02c3d811019f8da90b1cfd6fb34 /kafka/coordinator
parent9d44e3cf8b6a75b11f1087282157aa48eba68a64 (diff)
downloadkafka-python-0a2ccba3cb1b8636f615a30821123720773a8dfa.tar.gz
(Attempt to) Fix deadlock between consumer and heartbeat (#1628)
Diffstat (limited to 'kafka/coordinator')
-rw-r--r--kafka/coordinator/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/kafka/coordinator/base.py b/kafka/coordinator/base.py
index 7deeaf0..8ce9a24 100644
--- a/kafka/coordinator/base.py
+++ b/kafka/coordinator/base.py
@@ -347,7 +347,7 @@ class BaseCoordinator(object):
def ensure_active_group(self):
"""Ensure that the group is active (i.e. joined and synced)"""
- with self._lock:
+ with self._client._lock, self._lock:
if self._heartbeat_thread is None:
self._start_heartbeat_thread()