Skip to content

SOLR-18035 Remove pauseBeforeStart parameter from leader election #3966

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
psalagnac merged 3 commits into from
Dec 31, 2025
Merged

SOLR-18035 Remove pauseBeforeStart parameter from leader election #3966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b6e0f1
Leader election: Remove pauseBeforeStart parameter
psalagnac Dec 18, 2025
0559129
Changelog
psalagnac Dec 18, 2025
6aded5f
Merge branch 'main' into leader-election-pause
psalagnac Dec 30, 2025
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
7 changes: 7 additions & 0 deletions changelog/unreleased/SOLR-18035-remove-election-pause-parameter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
title: Remove unused parameter pauseBeforeStart from leader election code
type: removed
authors:
- name: Pierre Salagnac
links:
- name: SOLR-18035
url: https://issues.apache.org/jira/browse/SOLR-18035
2 changes: 1 addition & 1 deletion solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void cancelElection() throws InterruptedException, KeeperException {
}
}

abstract void runLeaderProcess(boolean weAreReplacement, int pauseBeforeStartMs)
abstract void runLeaderProcess(boolean weAreReplacement)
throws KeeperException, InterruptedException;

public void checkIfIamLeaderFired() {}
Expand Down
2 changes: 1 addition & 1 deletion solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ context.leaderSeqPath, watchedNode, getSeq(context.leaderSeqPath), context),

protected void runIamLeaderProcess(final ElectionContext context, boolean weAreReplacement)
throws KeeperException, InterruptedException {
context.runLeaderProcess(weAreReplacement, 0);
context.runLeaderProcess(weAreReplacement);
}

/**
Expand Down
12 changes: 2 additions & 10 deletions solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ public OverseerElectionContext(
}

@Override
void runLeaderProcess(boolean weAreReplacement, int pauseBeforeStartMs)
throws KeeperException, InterruptedException {
void runLeaderProcess(boolean weAreReplacement) throws KeeperException, InterruptedException {
if (isClosed) {
return;
}
Expand All @@ -63,14 +62,7 @@ void runLeaderProcess(boolean weAreReplacement, int pauseBeforeStartMs)
ZkNodeProps myProps = new ZkNodeProps(ID, id);

zkClient.makePath(leaderPath, Utils.toJSON(myProps), CreateMode.EPHEMERAL);
if (pauseBeforeStartMs > 0) {
try {
Thread.sleep(pauseBeforeStartMs);
} catch (InterruptedException e) {
Thread.interrupted();
log.warn("Wait interrupted ", e);
}
}

synchronized (this) {
if (!this.isClosed && !overseer.getZkController().getCoreContainer().isShutDown()) {
overseer.start(id);
Expand Down
5 changes: 2 additions & 3 deletions solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ public ElectionContext copy() {
* weAreReplacement: has someone else been the leader already?
*/
@Override
void runLeaderProcess(boolean weAreReplacement, int pauseBeforeStart)
throws KeeperException, InterruptedException {
void runLeaderProcess(boolean weAreReplacement) throws KeeperException, InterruptedException {
String coreName = leaderProps.getStr(ZkStateReader.CORE_NAME_PROP);
ActionThrottle lt;
try (SolrCore core = cc.getCore(coreName)) {
Expand Down Expand Up @@ -296,7 +295,7 @@ void runLeaderProcess(boolean weAreReplacement, int pauseBeforeStart)
coreNodeName);
zkController.getShardTerms(collection, shardId).setTermEqualsToLeader(coreNodeName);
}
super.runLeaderProcess(weAreReplacement, 0);
super.runLeaderProcess(weAreReplacement);
try (SolrCore core = cc.getCore(coreName)) {
if (core != null) {
core.getCoreDescriptor().getCloudDescriptor().setLeader(true);
Expand Down
3 changes: 1 addition & 2 deletions solr/core/src/java/org/apache/solr/cloud/ShardLeaderElectionContextBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ public void cancelElection() throws InterruptedException, KeeperException {
}

@Override
void runLeaderProcess(boolean weAreReplacement, int pauseBeforeStartMs)
throws KeeperException, InterruptedException {
void runLeaderProcess(boolean weAreReplacement) throws KeeperException, InterruptedException {
// register as leader - if an ephemeral is already there, wait to see if it goes away

String parent = ZkMaintenanceUtils.getZkParent(leaderPath);
Expand Down
5 changes: 2 additions & 3 deletions solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,8 @@ public TestLeaderElectionContext(
}

@Override
void runLeaderProcess(boolean weAreReplacement, int pauseBeforeStartMs)
throws KeeperException, InterruptedException {
super.runLeaderProcess(weAreReplacement, pauseBeforeStartMs);
void runLeaderProcess(boolean weAreReplacement) throws KeeperException, InterruptedException {
super.runLeaderProcess(weAreReplacement);
if (runLeaderDelay > 0) {
log.info("Sleeping for {}ms to simulate leadership takeover delay", runLeaderDelay);
Thread.sleep(runLeaderDelay);
Expand Down