Permit wait_for_active_shards warnings in master

Part of the fixes for elastic#66419, this commit permits nodes to emit the deprecation warning regarding not specifying `?wait_for_active_shards` when closing an index in 7.x versions for x ≥ 12. This change is required on `master` too since the BWC tests encounter these warnings. Relates elastic#67246, which is the 7.x part of this change.
DaveCTurner · Jan 14, 2021 · 726450e · 726450e
1 parent 11640bc
commit 726450e
Show file tree

Hide file tree

Showing 34 changed files with 179 additions and 4 deletions.
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/40_restore.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/40_restore.yml
@@ -4,6 +4,8 @@
 #
 ---
 "Create a snapshot and then restore it":
+  - skip:
+      features: ["allowed_warnings"]
 
   # Create repository
   - do:
@@ -47,6 +49,8 @@
   - 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/...pository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml b/...pository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml
@@ -4,6 +4,8 @@
 #
 ---
 "Create a snapshot and then restore it":
+  - skip:
+      features: ["allowed_warnings"]
 
   # Create repository
   - do:
@@ -49,6 +51,8 @@
   - 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/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml
@@ -388,6 +388,7 @@
   - 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:
@@ -399,6 +400,8 @@
   - 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:
@@ -419,7 +422,7 @@
 "Alias against closed index (pre 7.4.0)":
   - skip:
       version: "7.4.0 - "
-      features: node_selector
+      features: ["node_selector", "allowed_warnings"]
       reason:  "is_write_index is shown in cat.aliases starting version 7.4.0"
 
   - do:
@@ -432,6 +435,8 @@
   - 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:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml
@@ -54,6 +54,7 @@
   - skip:
       version: "7.2.0 - "
       reason:  "closed indices are replicated starting version 7.2.0"
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -66,6 +67,8 @@
   - 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:
@@ -95,6 +98,7 @@
   - skip:
       version: " - 7.1.99"
       reason:  "closed indices are replicated starting version 7.2.0"
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -107,6 +111,8 @@
   - 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:
@@ -221,6 +227,8 @@
 
 ---
 "Test cat indices sort":
+  - skip:
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -249,6 +257,8 @@
   - 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/main/resources/rest-api-spec/test/cat.recovery/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.recovery/10_basic.yml
@@ -84,6 +84,7 @@
   - skip:
       version: " - 7.99.99"
       reason: format of bytes output changed in 8.0.0
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -96,6 +97,8 @@
   - 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/main/resources/rest-api-spec/test/cat.segments/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml
@@ -83,6 +83,8 @@
 
 ---
 "Test cat segments on closed index behaviour":
+  - skip:
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -95,6 +97,8 @@
   - 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/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml
@@ -52,6 +52,7 @@
   - skip:
       version: " - 7.1.99"
       reason: closed indices are replicated starting version 7.2.0
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -68,6 +69,8 @@
   - 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/main/resources/rest-api-spec/test/cluster.health/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml
@@ -134,6 +134,7 @@
   - skip:
       version: "7.2.0 - "
       reason:  "closed indices are replicated starting version 7.2.0"
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -180,6 +181,8 @@
   - 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
@@ -208,6 +211,7 @@
   - skip:
       version: " - 7.1.99"
       reason:  "closed indices are replicated starting version 7.2.0"
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -255,6 +259,8 @@
   - 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/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/30_indices_options.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/30_indices_options.yml
@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -23,6 +25,8 @@ 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/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/30_expand_wildcards.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/30_expand_wildcards.yml
@@ -1,4 +1,6 @@
 setup:
+  - skip:
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -25,6 +27,8 @@ 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/main/resources/rest-api-spec/test/indices.get/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/10_basic.yml
@@ -1,5 +1,7 @@
 ---
 setup:
+  - skip:
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -38,6 +40,8 @@ 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/main/resources/rest-api-spec/test/indices.get_alias/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/10_basic.yml
@@ -1,6 +1,5 @@
 ---
 setup:
-
   - do:
       indices.create:
         index: test_index
@@ -303,10 +302,14 @@ setup:
 
 ---
 "Get alias against closed indices":
+  - skip:
+      features: ["allowed_warnings"]
 
   - 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/...-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml b/...-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml
@@ -1,5 +1,8 @@
 ---
 setup:
+  - skip:
+      features: ["allowed_warnings"]
+
   - do:
         indices.create:
           index: test-xxx
@@ -52,6 +55,8 @@ 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/main/resources/rest-api-spec/test/indices.open/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml
@@ -1,5 +1,8 @@
 ---
 "Basic test for index open/close":
+  - skip:
+      features: ["allowed_warnings"]
+
   - do:
       indices.create:
         index: test_index
@@ -14,6 +17,8 @@
   - 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:
@@ -38,6 +43,8 @@
 
 ---
 "Open index with wait_for_active_shards set to all":
+  - skip:
+      features: ["allowed_warnings"]
 
   - do:
       indices.create:
@@ -49,6 +56,8 @@
   - 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:
@@ -81,6 +90,9 @@
   - match: { shards_acknowledged: true }
 ---
 "Close index response with result per index":
+  - skip:
+      features: ["allowed_warnings"]
+
   - do:
       indices.create:
         index: index_1
@@ -105,6 +117,8 @@
   - 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/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml
@@ -23,9 +23,14 @@ setup:
 
 ---
 "All indices":
+  - skip:
+      features: ["allowed_warnings"]
+
   - 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:
@@ -50,9 +55,14 @@ setup:
 
 ---
 "Trailing wildcard":
+  - skip:
+      features: ["allowed_warnings"]
+
   - 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:
@@ -77,9 +87,14 @@ setup:
 
 ---
 "Only wildcard":
+  - skip:
+      features: ["allowed_warnings"]
+
   - 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: