Wait for active shards when closing indices (#66415)

In 7.x the default for `wait_for_active_shards` on a close index request
is `NONE`, so in cases where we want to wait for active shards we must
be explicit.

Closes #66411

Author: DaveCTurner

x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java

@@ -20,6 +20,7 @@
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
 import org.elasticsearch.action.admin.indices.stats.ShardStats;
 import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -797,7 +798,6 @@ public void testSnapshotMountedIndexWithTimestampsRecordsTimestampRangeInIndexMe
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/66411")
     public void testSnapshotOfSearchableSnapshotIncludesNoDataButCanBeRestored() throws Exception {
         final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
         createAndPopulateIndex(
@@ -845,7 +845,7 @@ public void testSnapshotOfSearchableSnapshotIncludesNoDataButCanBeRestored() thr
 
         if (randomBoolean()) {
             logger.info("--> closing index before snapshot");
-            assertAcked(client().admin().indices().prepareClose(restoredIndexName));
+            assertAcked(client().admin().indices().prepareClose(restoredIndexName).setWaitForActiveShards(ActiveShardCount.DEFAULT));
         }
 
         logger.info("--> starting to take snapshot-2");

x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/AbstractSearchableSnapshotsRestTestCase.java

@@ -219,6 +219,7 @@ public void testSnapshotOfSearchableSnapshot() throws Exception {
             if (randomBoolean()) {
                 logger.info("--> closing index [{}]", restoredIndexName);
                 final Request closeRequest = new Request(HttpPost.METHOD_NAME, restoredIndexName + "/_close");
+                closeRequest.addParameter("wait_for_active_shards", "all");
                 assertOK(client().performRequest(closeRequest));
             }