[DSL] Avoid reading the PREFER_ILM setting until needed (#105446) (#105457)

andreidan · web-flow · commit 9e563d947f5d · 2024-02-13T11:12:43.000-05:00
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java
@@ -772,10 +772,9 @@ public boolean isIndexManagedByDataStreamLifecycle(Index index, Function<String,
      * access method.
      */
     private boolean isIndexManagedByDataStreamLifecycle(IndexMetadata indexMetadata) {
-        boolean preferIlm = PREFER_ILM_SETTING.get(indexMetadata.getSettings());
         if (indexMetadata.getLifecyclePolicyName() != null && lifecycle != null && lifecycle.isEnabled()) {
             // when both ILM and data stream lifecycle are configured, choose depending on the configured preference for this backing index
-            return preferIlm == false;
+            return PREFER_ILM_SETTING.get(indexMetadata.getSettings()) == false;
         }
         return lifecycle != null && lifecycle.isEnabled();
     }

Original file line number	Diff line number	Diff line change
`@@ -772,10 +772,9 @@ public boolean isIndexManagedByDataStreamLifecycle(Index index, Function<String,`
`772`	`772`	`* access method.`
`773`	`773`	`*/`
`774`	`774`	`private boolean isIndexManagedByDataStreamLifecycle(IndexMetadata indexMetadata) {`
`775`		`- boolean preferIlm = PREFER_ILM_SETTING.get(indexMetadata.getSettings());`
`776`	`775`	`if (indexMetadata.getLifecyclePolicyName() != null && lifecycle != null && lifecycle.isEnabled()) {`
`777`	`776`	`// when both ILM and data stream lifecycle are configured, choose depending on the configured preference for this backing index`
`778`		`- return preferIlm == false;`
	`777`	`+ return PREFER_ILM_SETTING.get(indexMetadata.getSettings()) == false;`
`779`	`778`	`}`
`780`	`779`	`return lifecycle != null && lifecycle.isEnabled();`
`781`	`780`	`}`