From 38801075a4bdbd1c949193c83b4cc4f9d3af856e Mon Sep 17 00:00:00 2001 From: Joshua Adams Date: Thu, 2 Oct 2025 14:21:55 +0100 Subject: [PATCH] Remove FailedToCommitClusterStateException Check Removes a check on `FailedToCommitClusterStateException` with a message "node closed" inside QueryableBuiltInRolesSynchronizer .isExpectedFailure since this exception was changed to a NotMasterException inside #135008 Relates to: ES-13061 --- .../security/support/QueryableBuiltInRolesSynchronizer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/QueryableBuiltInRolesSynchronizer.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/QueryableBuiltInRolesSynchronizer.java index 65595f85d931b..101d308b36371 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/QueryableBuiltInRolesSynchronizer.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/QueryableBuiltInRolesSynchronizer.java @@ -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; @@ -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) {