Only add verified if not verified (with read-only + write block at th…

…e same time).
henningandersen · Jan 16, 2025 · 3b80145 · 3b80145
1 parent 48f19b3
commit 3b80145
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexStateService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexStateService.java
@@ -1059,10 +1059,12 @@ private static Tuple<ClusterState, List<AddBlockResult>> finalizeBlock(
 
                 if (block.getBlock().contains(ClusterBlockLevel.WRITE) && markVerified) {
                     final IndexMetadata indexMetadata = metadata.getSafe(index);
-                    final IndexMetadata.Builder updatedMetadata = IndexMetadata.builder(indexMetadata)
-                        .settings(Settings.builder().put(indexMetadata.getSettings()).put(VERIFIED_READ_ONLY_SETTING.getKey(), true))
-                        .settingsVersion(indexMetadata.getSettingsVersion() + 1);
-                    metadata.put(updatedMetadata);
+                    if (VERIFIED_READ_ONLY_SETTING.get(indexMetadata.getSettings()) == false) {
+                        final IndexMetadata.Builder updatedMetadata = IndexMetadata.builder(indexMetadata)
+                            .settings(Settings.builder().put(indexMetadata.getSettings()).put(VERIFIED_READ_ONLY_SETTING.getKey(), true))
+                            .settingsVersion(indexMetadata.getSettingsVersion() + 1);
+                        metadata.put(updatedMetadata);
+                    }
                 }
             } catch (final IndexNotFoundException e) {
                 logger.debug("index {} has been deleted since blocking it started, ignoring", index);