Skip to content

Separate stop/start logic for LeaderLatch #17546

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
georgew5656 merged 1 commit into from
Dec 6, 2024
Merged

Separate stop/start logic for LeaderLatch #17546

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
15 changes: 10 additions & 5 deletions server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ public void isLeader()
}
catch (Exception ex) {
log.makeAlert(ex, "listener becomeLeader() failed. Unable to become leader").emit();

recreateLeaderLatch();
stopAndCreateNewLeaderLatch();
startLeaderLatch();
}
}

Expand All @@ -119,8 +119,10 @@ public void notLeader()
}

leader = false;
// give others a chance to become leader.
stopAndCreateNewLeaderLatch();
listener.stopBeingLeader();
recreateLeaderLatch();
startLeaderLatch();
}
catch (Exception ex) {
log.makeAlert(ex, "listener.stopBeingLeader() failed. Unable to stopBeingLeader").emit();
Expand Down Expand Up @@ -205,15 +207,18 @@ public void unregisterListener()
listenerExecutor.shutdownNow();
}

private void recreateLeaderLatch()
private void stopAndCreateNewLeaderLatch()
{
// give others a chance to become leader.
CloseableUtils.closeAndSuppressExceptions(
createNewLeaderLatchWithListener(),
e -> log.warn("Could not close old leader latch; continuing with new one anyway.")
);

leader = false;
}

private void startLeaderLatch()
{
try {
//Small delay before starting the latch so that others waiting are chosen to become leader.
Thread.sleep(ThreadLocalRandom.current().nextInt(1000, 5000));
Expand Down