Skip to content

Attempt to join heartbeat thread during close() #1735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2019
Merged

Attempt to join heartbeat thread during close() #1735

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions kafka/coordinator/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,9 +752,8 @@ def __del__(self):
def close(self):
"""Close the coordinator, leave the current group,
and reset local generation / member_id"""
with self._client._lock, self._lock:
self._close_heartbeat_thread()
self.maybe_leave_group()
self._close_heartbeat_thread()
self.maybe_leave_group()

def maybe_leave_group(self):
"""Leave the current group and reset local generation/memberId."""
Expand Down Expand Up @@ -918,6 +917,10 @@ def close(self):
self.closed = True
with self.coordinator._lock:
self.coordinator._lock.notify()
if self.is_alive():
self.join(self.coordinator.config['heartbeat_interval_ms'] / 1000)
if self.is_alive():
log.warning("Heartbeat thread did not fully terminate during close")

def run(self):
try:
Expand Down