Add search shards test

Author: benchaplin

server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithIndexBlocksIT.java

@@ -9,12 +9,18 @@
 
 package org.elasticsearch.search;
 
+import com.carrotsearch.randomizedtesting.annotations.Repeat;
+
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.ClosePointInTimeRequest;
 import org.elasticsearch.action.search.OpenPointInTimeRequest;
 import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchShardsGroup;
+import org.elasticsearch.action.search.SearchShardsRequest;
 import org.elasticsearch.action.search.TransportClosePointInTimeAction;
 import org.elasticsearch.action.search.TransportOpenPointInTimeAction;
+import org.elasticsearch.action.search.TransportSearchShardsAction;
+import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlocks;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -23,6 +29,7 @@
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.index.query.MatchAllQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.PointInTimeBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -103,6 +110,29 @@ public void testMultiSearchIndicesWithIndexRefreshBlocks() {
         );
     }
 
+    @Repeat(iterations = 100)
+    public void testSearchShardsOnIndicesWithIndexRefreshBlocks() {
+        List<String> indices = createIndices();
+        indexDocuments(indices);
+        List<String> unblockedIndices = addIndexRefreshBlockToSomeIndices(indices);
+
+        var resp = client().execute(
+            TransportSearchShardsAction.TYPE,
+            new SearchShardsRequest(
+                indices.toArray(new String[0]),
+                IndicesOptions.DEFAULT,
+                new MatchAllQueryBuilder(),
+                null,
+                null,
+                true,
+                null
+            )
+        ).actionGet();
+        for (SearchShardsGroup group : resp.getGroups()) {
+            assertTrue(unblockedIndices.contains(group.shardId().getIndex().getName()));
+        }
+    }
+
     private List<String> createIndices() {
         int numIndices = randomIntBetween(1, 3);
         List<String> indices = new ArrayList<>();

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

@@ -1813,7 +1813,7 @@ public void onFailure(Exception ex) {
         }
     }
 
-    public void testIgnoreBlockedIndices() {
+    public void testIgnoreIndicesWithIndexRefreshBlock() {
         int numIndices = randomIntBetween(1, 10);
         String[] concreteIndices = new String[numIndices];
         for (int i = 0; i < numIndices; i++) {