Fix a bug in the cluster state application

alexey-ivanov-es · alexey-ivanov-es · commit 0234193e57d5 · 2025-04-28T17:03:48.000+01:00
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ProjectMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ProjectMetadata.java
@@ -1109,6 +1109,9 @@ public boolean isIndexManagedByILM(IndexMetadata indexMetadata) {
     }
 
     static boolean isStateEquals(ProjectMetadata project1, ProjectMetadata project2) {
+        if (project1.settings().equals(project2.settings()) == false) {
+            return false;
+        }
         if (project1.templates().equals(project2.templates()) == false) {
             return false;
         }
@@ -2389,7 +2392,7 @@ public ProjectMetadata apply(ProjectMetadata part) {
                 && builder.dataStreamMetadata() == part.custom(DataStreamMetadata.TYPE, DataStreamMetadata.EMPTY)) {
                 builder.previousIndicesLookup = part.indicesLookup;
             }
-            builder.settings = settingsDiff.apply(builder.settings);
+            builder.settings = settingsDiff.apply(part.settings);
             return builder.build(true);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1109,6 +1109,9 @@ public boolean isIndexManagedByILM(IndexMetadata indexMetadata) {`
`1109`	`1109`	`}`
`1110`	`1110`
`1111`	`1111`	`static boolean isStateEquals(ProjectMetadata project1, ProjectMetadata project2) {`
	`1112`	`+ if (project1.settings().equals(project2.settings()) == false) {`
	`1113`	`+ return false;`
	`1114`	`+ }`
`1112`	`1115`	`if (project1.templates().equals(project2.templates()) == false) {`
`1113`	`1116`	`return false;`
`1114`	`1117`	`}`
`@@ -2389,7 +2392,7 @@ public ProjectMetadata apply(ProjectMetadata part) {`
`2389`	`2392`	`&& builder.dataStreamMetadata() == part.custom(DataStreamMetadata.TYPE, DataStreamMetadata.EMPTY)) {`
`2390`	`2393`	`builder.previousIndicesLookup = part.indicesLookup;`
`2391`	`2394`	`}`
`2392`		`- builder.settings = settingsDiff.apply(builder.settings);`
	`2395`	`+ builder.settings = settingsDiff.apply(part.settings);`
`2393`	`2396`	`return builder.build(true);`
`2394`	`2397`	`}`
`2395`	`2398`