Skip to content

Remove FailedToCommitClusterStateException Check #135846

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 2 commits into
base: main
Choose a base branch
from
+1 −3
Open

Remove FailedToCommitClusterStateException Check #135846

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3880107
Remove FailedToCommitClusterStateException Check
joshua-adams-1 Oct 2, 2025
286fb12
Merge branch 'main' into batch-failed-to-not-master-extra-changes
joshua-adams-1 Oct 3, 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
4 changes: 1 addition & 3 deletions ...main/java/org/elasticsearch/xpack/security/support/QueryableBuiltInRolesSynchronizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.elasticsearch.cluster.ClusterStateTaskListener;
import org.elasticsearch.cluster.NotMasterException;
import org.elasticsearch.cluster.SimpleBatchedExecutor;
import org.elasticsearch.cluster.coordination.FailedToCommitClusterStateException;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.metadata.ProjectMetadata;
Expand Down Expand Up @@ -309,8 +308,7 @@ private static boolean isExpectedFailure(final Exception e) {
|| cause instanceof ResourceAlreadyExistsException
|| cause instanceof VersionConflictEngineException
|| cause instanceof DocumentMissingException
|| cause instanceof FailedToMarkBuiltInRolesAsSyncedException
|| (e instanceof FailedToCommitClusterStateException && "node closed".equals(cause.getMessage()));
|| cause instanceof FailedToMarkBuiltInRolesAsSyncedException;
}

private boolean shouldSyncBuiltInRoles(final ClusterState state) {
Expand Down