Remove unused parameter from IndexRoutingTable#readyForSearch (#121152)

fcofdez · web-flow · commit 7d9a8455d6ce · 2025-01-29T14:23:35.000+01:00
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java
@@ -9,7 +9,6 @@
 
 package org.elasticsearch.cluster.routing;
 
-import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.Diff;
 import org.elasticsearch.cluster.SimpleDiffable;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -236,7 +235,7 @@ public boolean allPrimaryShardsActive() {
     /**
      * @return <code>true</code> if an index is available to service search queries.
      */
-    public boolean readyForSearch(ClusterState clusterState) {
+    public boolean readyForSearch() {
         for (IndexShardRoutingTable shardRoutingTable : this.shards) {
             boolean found = false;
             for (int idx = 0; idx < shardRoutingTable.size(); idx++) {
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java
@@ -11,7 +11,6 @@
 
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
-import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.routing.RecoverySource.ExistingStoreRecoverySource;
 import org.elasticsearch.cluster.routing.RecoverySource.PeerRecoverySource;
@@ -935,7 +934,7 @@ public boolean isPromotableToPrimary() {
     }
 
     /**
-     * Determine if role searchable. Consumers should prefer {@link IndexRoutingTable#readyForSearch(ClusterState)} to determine if an index
+     * Determine if role searchable. Consumers should prefer {@link IndexRoutingTable#readyForSearch()} to determine if an index
      * is ready to be searched.
      */
     public boolean isSearchable() {
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/IndexRoutingTableTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/IndexRoutingTableTests.java
@@ -44,13 +44,13 @@ public void testReadyForSearch() {
             List.of(getShard(p2, true, ShardRoutingState.STARTED, ShardRouting.Role.DEFAULT))
         );
         IndexRoutingTable indexRoutingTable = new IndexRoutingTable(index, new IndexShardRoutingTable[] { shardTable1, shardTable2 });
-        assertTrue(indexRoutingTable.readyForSearch(clusterState));
+        assertTrue(indexRoutingTable.readyForSearch());
 
         // 2 primaries that are index only
         shardTable1 = new IndexShardRoutingTable(p1, List.of(getShard(p1, true, ShardRoutingState.STARTED, ShardRouting.Role.INDEX_ONLY)));
         shardTable2 = new IndexShardRoutingTable(p2, List.of(getShard(p2, true, ShardRoutingState.STARTED, ShardRouting.Role.INDEX_ONLY)));
         indexRoutingTable = new IndexRoutingTable(index, new IndexShardRoutingTable[] { shardTable1, shardTable2 });
-        assertFalse(indexRoutingTable.readyForSearch(clusterState));
+        assertFalse(indexRoutingTable.readyForSearch());
 
         // 2 unassigned primaries that are index only
         shardTable1 = new IndexShardRoutingTable(
@@ -62,7 +62,7 @@ public void testReadyForSearch() {
             List.of(getShard(p2, true, ShardRoutingState.UNASSIGNED, ShardRouting.Role.INDEX_ONLY))
         );
         indexRoutingTable = new IndexRoutingTable(index, new IndexShardRoutingTable[] { shardTable1, shardTable2 });
-        assertFalse(indexRoutingTable.readyForSearch(clusterState));
+        assertFalse(indexRoutingTable.readyForSearch());
 
         // 2 primaries that are index only with replicas that are not all available
         shardTable1 = new IndexShardRoutingTable(
@@ -82,7 +82,7 @@ public void testReadyForSearch() {
             )
         );
         indexRoutingTable = new IndexRoutingTable(index, new IndexShardRoutingTable[] { shardTable1, shardTable2 });
-        assertFalse(indexRoutingTable.readyForSearch(clusterState));
+        assertFalse(indexRoutingTable.readyForSearch());
 
         // 2 primaries that are index only with some replicas that are all available
         shardTable1 = new IndexShardRoutingTable(
@@ -102,7 +102,7 @@ public void testReadyForSearch() {
             )
         );
         indexRoutingTable = new IndexRoutingTable(index, new IndexShardRoutingTable[] { shardTable1, shardTable2 });
-        assertTrue(indexRoutingTable.readyForSearch(clusterState));
+        assertTrue(indexRoutingTable.readyForSearch());
 
         // 2 unassigned primaries that are index only with some replicas that are all available
         shardTable1 = new IndexShardRoutingTable(
@@ -122,7 +122,7 @@ public void testReadyForSearch() {
             )
         );
         indexRoutingTable = new IndexRoutingTable(index, new IndexShardRoutingTable[] { shardTable1, shardTable2 });
-        assertTrue(indexRoutingTable.readyForSearch(clusterState));
+        assertTrue(indexRoutingTable.readyForSearch());
 
         // 2 primaries that are index only with at least 1 replica per primary that is available
         shardTable1 = new IndexShardRoutingTable(
@@ -142,7 +142,7 @@ public void testReadyForSearch() {
             )
         );
         indexRoutingTable = new IndexRoutingTable(index, new IndexShardRoutingTable[] { shardTable1, shardTable2 });
-        assertTrue(indexRoutingTable.readyForSearch(clusterState));
+        assertTrue(indexRoutingTable.readyForSearch());
     }
 
     private ShardRouting getShard(ShardId shardId, boolean isPrimary, ShardRoutingState state, ShardRouting.Role role) {
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrationEligibilityCheck.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrationEligibilityCheck.java
@@ -65,6 +65,6 @@ static boolean mlConfigIndexIsAllocated(ClusterState clusterState) {
         }
 
         IndexRoutingTable routingTable = clusterState.getRoutingTable().index(configIndexOrAlias.getWriteIndex());
-        return routingTable != null && routingTable.allPrimaryShardsActive() && routingTable.readyForSearch(clusterState);
+        return routingTable != null && routingTable.allPrimaryShardsActive() && routingTable.readyForSearch();
     }
 }
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedConfigAutoUpdater.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedConfigAutoUpdater.java
@@ -62,9 +62,7 @@ public boolean isAbleToRun(ClusterState latestState) {
                 continue;
             }
             IndexRoutingTable routingTable = latestState.getRoutingTable().index(index);
-            if (routingTable == null
-                || routingTable.allPrimaryShardsActive() == false
-                || routingTable.readyForSearch(latestState) == false) {
+            if (routingTable == null || routingTable.allPrimaryShardsActive() == false || routingTable.readyForSearch() == false) {
                 return false;
             }
         }
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedNodeSelector.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedNodeSelector.java
@@ -206,9 +206,7 @@ private AssignmentFailure verifyIndicesActive() {
 
         for (String concreteIndex : concreteIndices) {
             IndexRoutingTable routingTable = clusterState.getRoutingTable().index(concreteIndex);
-            if (routingTable == null
-                || routingTable.allPrimaryShardsActive() == false
-                || routingTable.readyForSearch(clusterState) == false) {
+            if (routingTable == null || routingTable.allPrimaryShardsActive() == false || routingTable.readyForSearch() == false) {
                 return new AssignmentFailure(
                     "cannot start datafeed ["
                         + datafeedId
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/TrainedModelStatsService.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/TrainedModelStatsService.java
@@ -240,9 +240,7 @@ static boolean verifyIndicesExistAndPrimaryShardsAreActive(ClusterState clusterS
                 return false;
             }
             IndexRoutingTable routingTable = clusterState.getRoutingTable().index(index);
-            if (routingTable == null
-                || routingTable.allPrimaryShardsActive() == false
-                || routingTable.readyForSearch(clusterState) == false) {
+            if (routingTable == null || routingTable.allPrimaryShardsActive() == false || routingTable.readyForSearch() == false) {
                 return false;
             }
         }
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/task/AbstractJobPersistentTasksExecutor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/task/AbstractJobPersistentTasksExecutor.java
@@ -67,9 +67,7 @@ public static List<String> verifyIndicesPrimaryShardsAreActive(
                 continue;
             }
             IndexRoutingTable routingTable = clusterState.getRoutingTable().index(index);
-            if (routingTable == null
-                || routingTable.allPrimaryShardsActive() == false
-                || routingTable.readyForSearch(clusterState) == false) {
+            if (routingTable == null || routingTable.allPrimaryShardsActive() == false || routingTable.readyForSearch() == false) {
                 unavailableIndices.add(index);
             }
         }
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java
@@ -513,7 +513,7 @@ private Tuple<Boolean, Boolean> checkIndexAvailable(ClusterState state) {
         if (routingTable != null && routingTable.allPrimaryShardsActive()) {
             allPrimaryShards = true;
         }
-        if (routingTable != null && routingTable.readyForSearch(state)) {
+        if (routingTable != null && routingTable.readyForSearch()) {
             searchShards = true;
         }
         if (allPrimaryShards == false || searchShards == false) {
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/TransformInternalIndex.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/TransformInternalIndex.java
@@ -385,7 +385,7 @@ protected static boolean hasLatestVersionedIndex(ClusterState state) {
     protected static boolean allPrimaryShardsActiveForLatestVersionedIndex(ClusterState state) {
         IndexRoutingTable indexRouting = state.routingTable().index(TransformInternalIndexConstants.LATEST_INDEX_VERSIONED_NAME);
 
-        return indexRouting != null && indexRouting.allPrimaryShardsActive() && indexRouting.readyForSearch(state);
+        return indexRouting != null && indexRouting.allPrimaryShardsActive() && indexRouting.readyForSearch();
     }
 
     private static void waitForLatestVersionedIndexShardsActive(Client client, ActionListener<Void> listener) {
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java
@@ -188,9 +188,7 @@ static List<String> verifyIndicesPrimaryShardsAreActive(ClusterState clusterStat
         List<String> unavailableIndices = new ArrayList<>(indices.length);
         for (String index : indices) {
             IndexRoutingTable routingTable = clusterState.getRoutingTable().index(index);
-            if (routingTable == null
-                || routingTable.allPrimaryShardsActive() == false
-                || routingTable.readyForSearch(clusterState) == false) {
+            if (routingTable == null || routingTable.allPrimaryShardsActive() == false || routingTable.readyForSearch() == false) {
                 unavailableIndices.add(index);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,6 @@ static boolean mlConfigIndexIsAllocated(ClusterState clusterState) {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`IndexRoutingTable routingTable = clusterState.getRoutingTable().index(configIndexOrAlias.getWriteIndex());`
`68`		`- return routingTable != null && routingTable.allPrimaryShardsActive() && routingTable.readyForSearch(clusterState);`
	`68`	`+ return routingTable != null && routingTable.allPrimaryShardsActive() && routingTable.readyForSearch();`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@ public boolean isAbleToRun(ClusterState latestState) {`
`62`	`62`	`continue;`
`63`	`63`	`}`
`64`	`64`	`IndexRoutingTable routingTable = latestState.getRoutingTable().index(index);`
`65`		`- if (routingTable == null`
`66`		`- \|\| routingTable.allPrimaryShardsActive() == false`
`67`		`- \|\| routingTable.readyForSearch(latestState) == false) {`
	`65`	`+ if (routingTable == null \|\| routingTable.allPrimaryShardsActive() == false \|\| routingTable.readyForSearch() == false) {`
`68`	`66`	`return false;`
`69`	`67`	`}`
`70`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -240,9 +240,7 @@ static boolean verifyIndicesExistAndPrimaryShardsAreActive(ClusterState clusterS`
`240`	`240`	`return false;`
`241`	`241`	`}`
`242`	`242`	`IndexRoutingTable routingTable = clusterState.getRoutingTable().index(index);`
`243`		`- if (routingTable == null`
`244`		`- \|\| routingTable.allPrimaryShardsActive() == false`
`245`		`- \|\| routingTable.readyForSearch(clusterState) == false) {`
	`243`	`+ if (routingTable == null \|\| routingTable.allPrimaryShardsActive() == false \|\| routingTable.readyForSearch() == false) {`
`246`	`244`	`return false;`
`247`	`245`	`}`
`248`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,7 @@ public static List<String> verifyIndicesPrimaryShardsAreActive(`
`67`	`67`	`continue;`
`68`	`68`	`}`
`69`	`69`	`IndexRoutingTable routingTable = clusterState.getRoutingTable().index(index);`
`70`		`- if (routingTable == null`
`71`		`- \|\| routingTable.allPrimaryShardsActive() == false`
`72`		`- \|\| routingTable.readyForSearch(clusterState) == false) {`
	`70`	`+ if (routingTable == null \|\| routingTable.allPrimaryShardsActive() == false \|\| routingTable.readyForSearch() == false) {`
`73`	`71`	`unavailableIndices.add(index);`
`74`	`72`	`}`
`75`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ private Tuple<Boolean, Boolean> checkIndexAvailable(ClusterState state) {`
`513`	`513`	`if (routingTable != null && routingTable.allPrimaryShardsActive()) {`
`514`	`514`	`allPrimaryShards = true;`
`515`	`515`	`}`
`516`		`- if (routingTable != null && routingTable.readyForSearch(state)) {`
	`516`	`+ if (routingTable != null && routingTable.readyForSearch()) {`
`517`	`517`	`searchShards = true;`
`518`	`518`	`}`
`519`	`519`	`if (allPrimaryShards == false \|\| searchShards == false) {`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ protected static boolean hasLatestVersionedIndex(ClusterState state) {`
`385`	`385`	`protected static boolean allPrimaryShardsActiveForLatestVersionedIndex(ClusterState state) {`
`386`	`386`	`IndexRoutingTable indexRouting = state.routingTable().index(TransformInternalIndexConstants.LATEST_INDEX_VERSIONED_NAME);`
`387`	`387`
`388`		`- return indexRouting != null && indexRouting.allPrimaryShardsActive() && indexRouting.readyForSearch(state);`
	`388`	`+ return indexRouting != null && indexRouting.allPrimaryShardsActive() && indexRouting.readyForSearch();`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`private static void waitForLatestVersionedIndexShardsActive(Client client, ActionListener<Void> listener) {`