Skip to content

Replace FailedToCommitClusterStateException with NotMasterException #136083

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+2 −8
Open

Replace FailedToCommitClusterStateException with NotMasterException #136083

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2128eca
Replace FailedToCommitClusterStateException with NotMasterException
joshua-adams-1 Oct 7, 2025
a8694c5
Merge branch 'main' into batch-task-queue-failed-commit-exception
joshua-adams-1 Oct 7, 2025
8e2f84f
Replace FailedToCommitClusterStateException with NotMasterException
joshua-adams-1 Oct 7, 2025
74fbafb
Merge branch 'batch-task-queue-failed-commit-exception' of https://gi…
joshua-adams-1 Oct 7, 2025
b447361
Revert TransportClusterHealthAction change
joshua-adams-1 Oct 7, 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
6 changes: 2 additions & 4 deletions ...main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.elasticsearch.cluster.LocalMasterServiceTask;
import org.elasticsearch.cluster.NotMasterException;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.coordination.FailedToCommitClusterStateException;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.ProcessClusterEventTimeoutException;
Expand Down Expand Up @@ -243,9 +242,8 @@ public void onFailure(Exception e) {

static boolean isExpectedFailure(Exception e) {
return e instanceof NotMasterException
|| e instanceof FailedToCommitClusterStateException
&& e.getCause() instanceof EsRejectedExecutionException esre
&& esre.isExecutorShutdown();
&& e.getCause() instanceof EsRejectedExecutionException esre
&& esre.isExecutorShutdown();
}

});
Expand Down
8 changes: 1 addition & 7 deletions server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,13 +1607,7 @@ public void submitTask(String source, T task, @Nullable TimeValue timeout) {
} catch (Exception e) {
assert e instanceof EsRejectedExecutionException esre && esre.isExecutorShutdown() : e;
task.onFailure(
new FailedToCommitClusterStateException(
"could not schedule timeout handler for [%s][%s] on queue [%s]",
e,
source,
task,
name
)
new NotMasterException("could not schedule timeout handler for [%s][%s] on queue [%s]", e, source, task, name)
);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2249,7 +2249,7 @@ public void testTimeoutRejectionBehaviourAtSubmission() {
).submitTask(source, new ClusterStateTaskListener() {
@Override
public void onFailure(Exception e) {
if (e instanceof FailedToCommitClusterStateException
if (e instanceof NotMasterException
&& e.getMessage().startsWith("could not schedule timeout handler")
&& e.getCause() instanceof EsRejectedExecutionException esre
&& esre.isExecutorShutdown()
Expand Down