Revert "Warn of change of default of wait_for_active_shards (#67246)"

This reverts commit 8660e8d.

Author: DaveCTurner

client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesRequestConverters.java

@@ -38,7 +38,6 @@
 import org.elasticsearch.action.admin.indices.shrink.ResizeType;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest;
-import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.client.indices.AnalyzeRequest;
 import org.elasticsearch.client.indices.CloseIndexRequest;
 import org.elasticsearch.client.indices.CreateDataStreamRequest;
@@ -141,13 +140,6 @@ static Request closeIndex(CloseIndexRequest closeIndexRequest) {
         parameters.withTimeout(closeIndexRequest.timeout());
         parameters.withMasterTimeout(closeIndexRequest.masterNodeTimeout());
         parameters.withIndicesOptions(closeIndexRequest.indicesOptions());
-
-        final ActiveShardCount activeShardCount = closeIndexRequest.waitForActiveShards();
-        if (activeShardCount == ActiveShardCount.DEFAULT) {
-            request.addParameter("wait_for_active_shards", "index-setting");
-        } else {
-            parameters.withWaitForActiveShards(activeShardCount);
-        }
         request.addParameters(parameters.asMap());
         return request;
     }

client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CloseIndexRequest.java

@@ -19,6 +19,7 @@
 
 package org.elasticsearch.client.indices;
 
+import org.elasticsearch.action.admin.indices.open.OpenIndexResponse;
 import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.TimedRequest;
@@ -34,7 +35,7 @@ public class CloseIndexRequest extends TimedRequest implements Validatable {
 
     private String[] indices;
     private IndicesOptions indicesOptions = IndicesOptions.strictExpandOpen();
-    private ActiveShardCount waitForActiveShards = null;
+    private ActiveShardCount waitForActiveShards = ActiveShardCount.DEFAULT;
 
     /**
      * Creates a new close index request
@@ -81,14 +82,16 @@ public ActiveShardCount waitForActiveShards() {
     }
 
     /**
-     * Sets the number of shard copies that should be active before a close-index request returns. Defaults to {@code null}, which means not
-     * to wait. However the default behaviour is deprecated and will change in version 8. You can opt-in to the new default behaviour now by
-     * setting this to {@link ActiveShardCount#DEFAULT}, which will wait according to the setting {@code index.write.wait_for_active_shards}
-     * which by default will wait for one shard, the primary. Set this value to {@link ActiveShardCount#ALL} to wait for all shards (primary
-     * and all replicas) to be active before returning. Otherwise, use {@link ActiveShardCount#from(int)} to set this value to any
-     * non-negative integer up to the number of copies per shard (number of replicas + 1), to wait for the desired amount of shard copies
-     * to become active before returning. To explicitly preserve today's default behaviour and suppress the deprecation warning, set this
-     * property to {@code ActiveShardCount.from(0)}.
+     * Sets the number of shard copies that should be active for indices opening to return.
+     * Defaults to {@link ActiveShardCount#DEFAULT}, which will wait for one shard copy
+     * (the primary) to become active. Set this value to {@link ActiveShardCount#ALL} to
+     * wait for all shards (primary and all replicas) to be active before returning.
+     * Otherwise, use {@link ActiveShardCount#from(int)} to set this value to any
+     * non-negative integer, up to the number of copies per shard (number of replicas + 1),
+     * to wait for the desired amount of shard copies to become active before returning.
+     * Indices opening will only wait up until the timeout value for the number of shard copies
+     * to be active before returning.  Check {@link OpenIndexResponse#isShardsAcknowledged()} to
+     * determine if the requisite shard copies were all started before returning or timing out.
      *
      * @param waitForActiveShards number of active shard copies to wait on
      */

client/rest-high-level/src/test/java/org/elasticsearch/client/CCRIT.java

@@ -188,7 +188,6 @@ public void testIndexFollowing() throws Exception {
 
         // Need to close index prior to unfollowing it:
         CloseIndexRequest closeIndexRequest = new CloseIndexRequest("follower");
-        closeIndexRequest.waitForActiveShards(ActiveShardCount.from(0));
         org.elasticsearch.action.support.master.AcknowledgedResponse closeIndexReponse =
             highLevelClient().indices().close(closeIndexRequest, RequestOptions.DEFAULT);
         assertThat(closeIndexReponse.isAcknowledged(), is(true));

client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java

@@ -50,7 +50,6 @@
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.action.support.broadcast.BroadcastResponse;
@@ -905,7 +904,6 @@ public void testCloseExistingIndex() throws IOException {
         }
 
         CloseIndexRequest closeIndexRequest = new CloseIndexRequest(indices);
-        closeIndexRequest.waitForActiveShards(ActiveShardCount.from(0));
         CloseIndexResponse closeIndexResponse = execute(closeIndexRequest,
             highLevelClient().indices()::close, highLevelClient().indices()::closeAsync);
         assertTrue(closeIndexResponse.isAcknowledged());
@@ -928,7 +926,6 @@ public void testCloseNonExistentIndex() throws IOException {
         assertFalse(indexExists(nonExistentIndex));
 
         CloseIndexRequest closeIndexRequest = new CloseIndexRequest(nonExistentIndex);
-        closeIndexRequest.waitForActiveShards(ActiveShardCount.from(0));
         ElasticsearchException exception = expectThrows(ElasticsearchException.class,
                 () -> execute(closeIndexRequest, highLevelClient().indices()::close, highLevelClient().indices()::closeAsync));
         assertEquals(RestStatus.NOT_FOUND, exception.status());
@@ -937,7 +934,6 @@ public void testCloseNonExistentIndex() throws IOException {
     public void testCloseEmptyOrNullIndex() {
         String[] indices = randomBoolean() ? Strings.EMPTY_ARRAY : null;
         CloseIndexRequest closeIndexRequest = new CloseIndexRequest(indices);
-        closeIndexRequest.waitForActiveShards(ActiveShardCount.from(0));
         org.elasticsearch.client.ValidationException exception = expectThrows(org.elasticsearch.client.ValidationException.class,
             () -> execute(closeIndexRequest, highLevelClient().indices()::close, highLevelClient().indices()::closeAsync));
         assertThat(exception.validationErrors().get(0), equalTo("index is missing"));

client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesRequestConvertersTests.java

@@ -41,7 +41,6 @@
 import org.elasticsearch.action.admin.indices.shrink.ResizeType;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest;
-import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.client.indices.AnalyzeRequest;
 import org.elasticsearch.client.indices.CloseIndexRequest;
@@ -642,22 +641,6 @@ public void testCloseIndex() {
         RequestConvertersTests.setRandomMasterTimeout(closeIndexRequest, expectedParams);
         RequestConvertersTests.setRandomIndicesOptions(closeIndexRequest::indicesOptions, closeIndexRequest::indicesOptions,
             expectedParams);
-        switch (between(0, 3)) {
-            case 0:
-                break;
-            case 1:
-                closeIndexRequest.waitForActiveShards(ActiveShardCount.DEFAULT);
-                expectedParams.put("wait_for_active_shards", "index-setting");
-                break;
-            case 2:
-                closeIndexRequest.waitForActiveShards(ActiveShardCount.ALL);
-                expectedParams.put("wait_for_active_shards", "all");
-                break;
-            case 3:
-                closeIndexRequest.waitForActiveShards(ActiveShardCount.from(1));
-                expectedParams.put("wait_for_active_shards", "1");
-                break;
-        }
 
         Request request = IndicesRequestConverters.closeIndex(closeIndexRequest);
         StringJoiner endpoint = new StringJoiner("/", "/", "").add(String.join(",", indices)).add("_close");

client/rest-high-level/src/test/java/org/elasticsearch/client/RankEvalIT.java

@@ -108,7 +108,7 @@ public void testRankEvalRequest() throws IOException {
         }
 
         // now try this when test2 is closed
-        closeIndex("index2");
+        client().performRequest(new Request("POST", "index2/_close"));
         rankEvalRequest.indicesOptions(IndicesOptions.fromParameters(null, "true", null, "false", SearchRequest.DEFAULT_INDICES_OPTIONS));
         response = execute(rankEvalRequest, highLevelClient()::rankEval, highLevelClient()::rankEvalAsync);
     }

client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CCRDocumentationIT.java

@@ -321,7 +321,6 @@ public void testUnfollow() throws Exception {
             assertThat(unfollowResponse.isAcknowledged(), is(true));
 
             CloseIndexRequest closeIndexRequest = new CloseIndexRequest(followIndex);
-            closeIndexRequest.waitForActiveShards(ActiveShardCount.from(0));
             assertThat(client.indices().close(closeIndexRequest, RequestOptions.DEFAULT).isAcknowledged(), is(true));
         }
 
@@ -354,7 +353,6 @@ public void testUnfollow() throws Exception {
             assertThat(unfollowResponse.isAcknowledged(), is(true));
 
             CloseIndexRequest closeIndexRequest = new CloseIndexRequest(followIndex);
-            closeIndexRequest.waitForActiveShards(ActiveShardCount.from(0));
             assertThat(client.indices().close(closeIndexRequest, RequestOptions.DEFAULT).isAcknowledged(), is(true));
         }
 

client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java

@@ -1469,8 +1469,6 @@ public void testCloseIndex() throws Exception {
             CloseIndexRequest request = new CloseIndexRequest("index"); // <1>
             // end::close-index-request
 
-            request.waitForActiveShards(ActiveShardCount.from(0));
-
             // tag::close-index-request-timeout
             request.setTimeout(TimeValue.timeValueMinutes(2)); // <1>
             // end::close-index-request-timeout

distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/WaitForRefreshAndCloseIT.java

@@ -97,9 +97,7 @@ private void closeWhileListenerEngaged(ActionFuture<String> future) throws Excep
         });
 
         // Close the index. That should flush the listener.
-        final Request closeRequest = new Request("POST", "/test/_close");
-        closeRequest.addParameter("wait_for_active_shards", "0");
-        client().performRequest(closeRequest);
+        client().performRequest(new Request("POST", "/test/_close"));
 
         /*
          * The request may fail, but we really, really, really want to make

docs/reference/ccr/apis/follow/post-unfollow.asciidoc

@@ -23,7 +23,7 @@ PUT /follower_index/_ccr/follow?wait_for_active_shards=1
 
 POST /follower_index/_ccr/pause_follow
 
-POST /follower_index/_close?wait_for_active_shards=0
+POST /follower_index/_close
 --------------------------------------------------
 // TESTSETUP
 // TEST[setup:remote_cluster_and_leader_index]

docs/reference/ccr/getting-started.asciidoc

@@ -243,7 +243,7 @@ replication
 --------------------------------------------------
 POST /server-metrics-follower/_ccr/pause_follow
 
-POST /server-metrics-follower/_close?wait_for_active_shards=0
+POST /server-metrics-follower/_close
 
 POST /server-metrics-follower/_ccr/unfollow
 --------------------------------------------------

docs/reference/ccr/managing.asciidoc

@@ -127,7 +127,7 @@ process. Then, close the follower index and recreate it. For example:
 ----------------------------------------------------------------------
 POST /follower_index/_ccr/pause_follow
 
-POST /follower_index/_close?wait_for_active_shards=0
+POST /follower_index/_close
 
 PUT /follower_index/_ccr/follow?wait_for_active_shards=1
 {

docs/reference/index-modules/similarity.asciidoc

@@ -540,7 +540,7 @@ request and <<indices-open-close,open>> it again afterwards:
 
 [source,console]
 --------------------------------------------------
-POST /index/_close?wait_for_active_shards=0
+POST /index/_close
 
 PUT /index/_settings
 {

docs/reference/indices/close.asciidoc

@@ -11,7 +11,6 @@ Closes an index.
 POST /my-index-000001/_close
 --------------------------------------------------
 // TEST[setup:my_index]
-// TEST[warning:the default value for the ?wait_for_active_shards parameter will change from '0' to 'index-setting' in version 8; specify '?wait_for_active_shards=index-setting' to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour]
 
 
 [[close-index-api-request]]
@@ -53,18 +52,7 @@ Defaults to `open`.
 
 include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=index-ignore-unavailable]
 
-`wait_for_active_shards`::
-+
---
-(Optional, string) The number of shard copies that must be active before
-proceeding with the operation. Set to `all`, `index-setting`, or any positive
-integer up to the total number of shards in the index (`number_of_replicas+1`).
-The value `index-setting` means to wait according to the index setting
-`index.write.wait_for_active_shards`. Default: `0`, meaning do not wait for any
-shards to be ready.
-
-See <<index-wait-for-active-shards>>.
---
+include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=wait_for_active_shards]
 
 include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=timeoutparms]
 
@@ -78,8 +66,7 @@ The following example shows how to close an index:
 --------------------------------------------------
 POST /my-index-000001/_close
 --------------------------------------------------
-// TEST[setup:my_index]
-// TEST[warning:the default value for the ?wait_for_active_shards parameter will change from '0' to 'index-setting' in version 8; specify '?wait_for_active_shards=index-setting' to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour]
+// TEST[s/^/PUT my-index-000001\n/]
 
 The API returns following response:
 

docs/reference/indices/open-close.asciidoc

@@ -12,7 +12,7 @@ opens any closed backing indices.
 POST /my-index-000001/_open
 --------------------------------------------------
 // TEST[setup:my_index]
-// TEST[s/^/POST \/my-index-000001\/_close?wait_for_active_shards=0\n/]
+// TEST[s/^/POST \/my-index-000001\/_close\n/]
 
 
 [[open-index-api-request]]
@@ -122,7 +122,7 @@ The following request re-opens a closed index named `my-index-000001`.
 --------------------------------------------------
 POST /my-index-000001/_open
 --------------------------------------------------
-// TEST[s/^/PUT my-index-000001\nPOST my-index-000001\/_close?wait_for_active_shards=0\n/]
+// TEST[s/^/PUT my-index-000001\nPOST my-index-000001\/_close\n/]
 
 The API returns the following response:
 

docs/reference/indices/resolve.asciidoc

@@ -13,7 +13,7 @@ supported.
 ----
 PUT /foo_closed
 
-POST /foo_closed/_close?wait_for_active_shards=0
+POST /foo_closed/_close
 
 PUT /remotecluster-bar-01
 

docs/reference/indices/update-settings.asciidoc

@@ -167,7 +167,7 @@ the following commands add the `content` analyzer to the `my-index-000001` index
 
 [source,console]
 --------------------------------------------------
-POST /my-index-000001/_close?wait_for_active_shards=0
+POST /my-index-000001/_close
 
 PUT /my-index-000001/_settings
 {

docs/reference/snapshot-restore/apis/restore-snapshot-api.asciidoc

@@ -38,13 +38,13 @@ PUT _snapshot/my_repository/snapshot_2?wait_for_completion=true
   }
 }
 
-POST /index_1/_close?wait_for_active_shards=0
+POST /index_1/_close
 
-POST /index_2/_close?wait_for_active_shards=0
+POST /index_2/_close
 
-POST /index_3/_close?wait_for_active_shards=0
+POST /index_3/_close
 
-POST /index_4/_close?wait_for_active_shards=0
+POST /index_4/_close
 
 ----
 // TESTSETUP

plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/40_restore.yml

@@ -4,8 +4,6 @@
 #
 ---
 "Create a snapshot and then restore it":
-  - skip:
-      features: ["allowed_warnings"]
 
   # Create repository
   - do:
@@ -49,8 +47,6 @@
   - do:
       indices.close:
         index : test_index
-      allowed_warnings:
-        - "the default value for the ?wait_for_active_shards parameter will change from '0' to 'index-setting' in version 8; specify '?wait_for_active_shards=index-setting' to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour"
 
   # Restore index
   - do:

plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml

@@ -4,8 +4,6 @@
 #
 ---
 "Create a snapshot and then restore it":
-  - skip:
-      features: ["allowed_warnings"]
 
   # Create repository
   - do:
@@ -51,8 +49,6 @@
   - do:
       indices.close:
         index : test_index
-      allowed_warnings:
-        - "the default value for the ?wait_for_active_shards parameter will change from '0' to 'index-setting' in version 8; specify '?wait_for_active_shards=index-setting' to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour"
 
   # Restore index
   - do:

rest-api-spec/src/main/resources/rest-api-spec/api/indices.close.json

@@ -56,7 +56,7 @@
       },
       "wait_for_active_shards":{
         "type":"string",
-        "description":"Sets the number of active shards to wait for before the operation returns. Set to `index-setting` to wait according to the index setting `index.write.wait_for_active_shards`, or `all` to wait for all shards, or an integer. Defaults to `0`."
+        "description":"Sets the number of active shards to wait for before the operation returns."
       }
     }
   }

rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml

@@ -388,7 +388,6 @@
   - skip:
       version: " - 7.3.99"
       reason:  "is_write_index is shown in cat.aliases starting version 7.4.0"
-      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -400,8 +399,6 @@
   - do:
       indices.close:
         index: test_index
-      allowed_warnings:
-        - "the default value for the ?wait_for_active_shards parameter will change from '0' to 'index-setting' in version 8; specify '?wait_for_active_shards=index-setting' to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour"
 
   - do:
       cat.aliases:
@@ -422,7 +419,7 @@
 "Alias against closed index (pre 7.4.0)":
   - skip:
       version: "7.4.0 - "
-      features: ["node_selector", "allowed_warnings"]
+      features: node_selector
       reason:  "is_write_index is shown in cat.aliases starting version 7.4.0"
 
   - do:
@@ -435,8 +432,6 @@
   - do:
       indices.close:
         index: test_index
-      allowed_warnings:
-        - "the default value for the ?wait_for_active_shards parameter will change from '0' to 'index-setting' in version 8; specify '?wait_for_active_shards=index-setting' to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour"
 
   - do:
       node_selector: