Fix off-by one error in TransportSearchActionTests

Closes #54156

Author: jimczi

server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java

@@ -844,9 +844,8 @@ public void testShouldMinimizeRoundtrips() throws Exception {
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/54156")
     public void testShouldPreFilterSearchShards() {
-        int numIndices = randomIntBetween(1, 10);
+        int numIndices = randomIntBetween(2, 10);
         Index[] indices = new Index[numIndices];
         for (int i = 0; i < numIndices; i++) {
             String indexName = randomAlphaOfLengthBetween(5, 10);
@@ -856,23 +855,23 @@ public void testShouldPreFilterSearchShards() {
         {
             SearchRequest searchRequest = new SearchRequest();
             assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
-                indices, randomIntBetween(1, 127)));
+                indices, randomIntBetween(2, 127)));
             assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
                 indices, randomIntBetween(127, 10000)));
         }
         {
             SearchRequest searchRequest = new SearchRequest()
                 .source(new SearchSourceBuilder().query(QueryBuilders.rangeQuery("timestamp")));
             assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
-                indices, randomIntBetween(1, 127)));
+                indices, randomIntBetween(2, 127)));
             assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
                 indices, randomIntBetween(127, 10000)));
         }
         {
             SearchRequest searchRequest = new SearchRequest()
                 .source(new SearchSourceBuilder().sort(SortBuilders.fieldSort("timestamp")));
             assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
-                indices, randomIntBetween(1, 127)));
+                indices, randomIntBetween(2, 127)));
             assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
                 indices, randomIntBetween(127, 10000)));
         }
@@ -881,15 +880,14 @@ public void testShouldPreFilterSearchShards() {
                 .source(new SearchSourceBuilder().sort(SortBuilders.fieldSort("timestamp")))
                 .scroll("5m");
             assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
-                indices, randomIntBetween(1, 127)));
+                indices, randomIntBetween(2, 127)));
             assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
                 indices, randomIntBetween(127, 10000)));
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/54156")
     public void testShouldPreFilterSearchShardsWithReadOnly() {
-        int numIndices = randomIntBetween(1, 10);
+        int numIndices = randomIntBetween(2, 10);
         int numReadOnly = randomIntBetween(1, numIndices);
         Index[] indices = new Index[numIndices];
         ClusterBlocks.Builder blocksBuilder = ClusterBlocks.builder();
@@ -908,15 +906,15 @@ public void testShouldPreFilterSearchShardsWithReadOnly() {
         {
             SearchRequest searchRequest = new SearchRequest();
             assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
-                indices, randomIntBetween(1, 127)));
+                indices, randomIntBetween(2, 127)));
             assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
                 indices, randomIntBetween(127, 10000)));
         }
         {
             SearchRequest searchRequest = new SearchRequest()
                 .source(new SearchSourceBuilder().query(QueryBuilders.rangeQuery("timestamp")));
             assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
-                indices, randomIntBetween(1, 127)));
+                indices, randomIntBetween(2, 127)));
             assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
                 indices, randomIntBetween(127, 10000)));
         }
@@ -925,7 +923,7 @@ public void testShouldPreFilterSearchShardsWithReadOnly() {
                 .source(new SearchSourceBuilder().query(QueryBuilders.rangeQuery("timestamp")));
             searchRequest.scroll("5s");
             assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
-                indices, randomIntBetween(127, 10000)));
+                indices, randomIntBetween(2, 127)));
             assertTrue(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
                 indices, randomIntBetween(127, 10000)));
         }
@@ -934,7 +932,7 @@ public void testShouldPreFilterSearchShardsWithReadOnly() {
                 .source(new SearchSourceBuilder().query(QueryBuilders.rangeQuery("timestamp")));
             searchRequest.searchType(SearchType.DFS_QUERY_THEN_FETCH);
             assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
-                indices, randomIntBetween(127, 10000)));
+                indices, randomIntBetween(2, 127)));
             assertFalse(TransportSearchAction.shouldPreFilterSearchShards(clusterState, searchRequest,
                 indices, randomIntBetween(127, 10000)));
         }