Remove support for wait_for_active_shards=index-setting in index clos…

…e API Specifiying `wait_for_active_shards=index-setting` was deprecared in elastic#67158 (8.0). It's redundant since it's the default behaviour in 8.x
arteam · Oct 14, 2024 · a74b605 · a74b605
1 parent a262eb6
commit a74b605
Show file tree

Hide file tree

Showing 36 changed files with 44 additions and 112 deletions.
diff --git a/...streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml b/...streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml
@@ -45,8 +45,7 @@
   - do:
       indices.close:
         index: logs-*
-      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"
+
   - is_true: acknowledged
   - length: { indices: 0 }
 

diff --git a/...a-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml b/...a-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml
@@ -230,8 +230,7 @@ teardown:
   - do:
       indices.close:
         index: ".ds-simple-data-stream1-*000001,.ds-simple-data-stream1-*000002"
-      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"
+
   - is_true: acknowledged
 
   - do:

diff --git a/...c/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml b/...c/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml
@@ -54,8 +54,7 @@ setup:
   - do:
       indices.close:
         index: test_index2
-      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:
       indices.create:

diff --git a/...ository-hdfs/src/yamlRestTest/resources/rest-api-spec/test/hdfs_repository/40_restore.yml b/...ository-hdfs/src/yamlRestTest/resources/rest-api-spec/test/hdfs_repository/40_restore.yml
@@ -49,8 +49,7 @@
   - 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:

diff --git a/...-hdfs/src/yamlRestTest/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml b/...-hdfs/src/yamlRestTest/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml
@@ -51,8 +51,7 @@
   - 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:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.aliases/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.aliases/10_basic.yml
@@ -388,8 +388,7 @@
   - 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:
@@ -425,8 +424,7 @@
   - 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: {}

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.indices/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.indices/10_basic.yml
@@ -87,8 +87,7 @@
   - do:
       indices.close:
         index: index-2
-      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"
+
   - is_true: acknowledged
 
   - do:
@@ -132,8 +131,7 @@
   - do:
       indices.close:
         index: index-2
-      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"
+
   - is_true: acknowledged
 
   - do:
@@ -278,8 +276,7 @@
   - do:
       indices.close:
         index: bar
-      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.indices:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.recovery/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.recovery/10_basic.yml
@@ -97,8 +97,7 @@
   - do:
       indices.close:
         index: index2
-      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"
+
   - is_true: acknowledged
 
   - do:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.segments/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.segments/10_basic.yml
@@ -97,8 +97,7 @@
   - do:
       indices.close:
         index: index1
-      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:
       catch: bad_request

diff --git a/...pec/src/yamlRestTest/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml b/...pec/src/yamlRestTest/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml
@@ -69,8 +69,7 @@
   - do:
       indices.close:
         index: test_closed
-      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"
+
 
   - match: { acknowledged: true }
 

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.health/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.health/10_basic.yml
@@ -219,8 +219,7 @@
   - do:
       indices.close:
         index: index-2
-      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"
+
   - is_true: acknowledged
 
   # closing the index-2 turns the cluster health back to green
@@ -297,8 +296,7 @@
   - do:
       indices.close:
         index: index-2
-      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"
+
   - is_true: acknowledged
 
   - do:

diff --git a/...-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.health/30_indices_options.yml b/...-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.health/30_indices_options.yml
@@ -25,8 +25,7 @@ setup:
   - do:
       indices.close:
         index: index-2
-      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:
       cluster.health:

diff --git a/...-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.state/30_expand_wildcards.yml b/...-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.state/30_expand_wildcards.yml
@@ -27,8 +27,7 @@ setup:
   - do:
       indices.close:
         index: test_close_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"
+
 
 ---
 "Test expand_wildcards parameter on closed, open indices and both":

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml
@@ -40,8 +40,7 @@ setup:
   - do:
       indices.close:
         index: test_index_3
-      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:
       cluster.health:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_alias/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_alias/10_basic.yml
@@ -312,8 +312,7 @@ setup:
   - do:
       indices.close:
         index: test_index_2
-      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:
       indices.get_alias:

diff --git a/...c/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml b/...c/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml
@@ -55,8 +55,7 @@ setup:
   - do:
       indices.close:
         index: test-xyy
-      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:
         cluster.health:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml
@@ -15,8 +15,7 @@
   - 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"
+
   - is_true: acknowledged
 
   - do:
@@ -55,8 +54,7 @@
   - 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"
+
   - is_true: acknowledged
 
   - do:
@@ -113,8 +111,7 @@
   - do:
       indices.close:
         index: "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"
+
 
   - match: { acknowledged: true }
   - match: { shards_acknowledged: true }

diff --git a/...i-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml b/...i-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml
@@ -24,8 +24,6 @@ setup:
   - do:
       indices.close:
         index: _all
-      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"
   - is_true: acknowledged
 
   - do:
@@ -57,8 +55,7 @@ setup:
   - do:
       indices.close:
         index: test_*
-      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"
+
   - is_true: acknowledged
 
   - do:
@@ -90,8 +87,7 @@ setup:
   - do:
       indices.close:
         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"
+
   - is_true: acknowledged
 
   - do:

diff --git a/...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_settings/10_basic.yml b/...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_settings/10_basic.yml
@@ -92,8 +92,7 @@ setup:
   - 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:
       indices.put_settings:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml
@@ -59,8 +59,7 @@
   - do:
       indices.close:
         index: test_2
-      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"
+
   - is_true: acknowledged
 
   - do:

diff --git a/...estTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml b/...estTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml
@@ -20,8 +20,7 @@ setup:
   - do:
       indices.close:
         index: index2
-      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"
+
 
 ---
 "Resolve cluster with indices and aliases":

diff --git a/...amlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml b/...amlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml
@@ -24,8 +24,7 @@ setup:
   - do:
       indices.close:
         index: test_index2
-      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:
       indices.create:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.segments/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.segments/10_basic.yml
@@ -105,8 +105,7 @@
   - do:
       indices.close:
         index: index1
-      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:
       catch: bad_request

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/80_indices_options.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/80_indices_options.yml
@@ -37,8 +37,7 @@
   - do:
       indices.close:
           index:  index_closed
-      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:
       catch:  /index_closed_exception/

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.restore/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.restore/10_basic.yml
@@ -46,8 +46,7 @@ setup:
   - 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:
       snapshot.restore:
@@ -92,8 +91,7 @@ setup:
   - 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:
       snapshot.restore:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml
@@ -120,8 +120,7 @@ teardown:
   - 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:

diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java
@@ -9,13 +9,11 @@
 
 package org.elasticsearch.rest.action.admin.indices;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.indices.close.CloseIndexRequest;
 import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.logging.DeprecationCategory;
 import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.rest.BaseRestHandler;
@@ -55,16 +53,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         closeIndexRequest.indicesOptions(IndicesOptions.fromRequest(request, closeIndexRequest.indicesOptions()));
         String waitForActiveShards = request.param("wait_for_active_shards");
         if ("index-setting".equalsIgnoreCase(waitForActiveShards)) {
-            deprecationLogger.warn(
-                DeprecationCategory.SETTINGS,
-                "close-index-wait_for_active_shards-index-setting",
-                "?wait_for_active_shards=index-setting is now the default behaviour; the 'index-setting' value for this parameter "
-                    + "should no longer be used since it will become unsupported in version "
-                    + (Version.V_8_0_0.major + 1)
-            );
-            // TODO in v9:
-            // - throw an IllegalArgumentException here
-            // - record the removal of support for this value as a breaking change
+            throw new IllegalArgumentException("wait_for_active_shards=index-setting shouldn't be used");
             // TODO in v10:
             // - remove the IllegalArgumentException here
         } else if (waitForActiveShards != null) {