Skip to content

Avoid self-join in heartbeat thread close #2488

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
Feb 21, 2025
Merged

Avoid self-join in heartbeat thread close #2488

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: 9 additions & 0 deletions kafka/coordinator/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,9 +920,18 @@ def disable(self):
self.enabled = False

def close(self):
if self.closed:
return
self.closed = True
with self.coordinator._lock:
self.coordinator._lock.notify()

# Generally this should not happen - close() is triggered
# by the coordinator. But in some cases GC may close the coordinator
# from within the heartbeat thread.
if threading.current_thread() == self:
return

if self.is_alive():
self.join(self.coordinator.config['heartbeat_interval_ms'] / 1000)
if self.is_alive():
Expand Down