Add allowed warnings for yaml rest test that using master_timeout

Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-project · Mar 30, 2022 · 4ac10f6 · 4ac10f6
1 parent b892805
commit 4ac10f6
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 2 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/10_basic.yml
@@ -31,6 +31,7 @@ setup:
   - skip:
       version: " - 7.3.99"
       reason: index cloning was added in 7.4.0
+      features: allowed_warnings
   # make it read-only
   - do:
       indices.put_settings:
@@ -46,6 +47,8 @@ setup:
 
   # now we do the actual clone
   - do:
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.clone:
         index: "source"
         target: "target"
@@ -94,9 +97,12 @@ setup:
   - skip:
       version: " - 7.3.99"
       reason: index cloning was added in 7.4.0
+      features: allowed_warnings
   # try to do an illegal clone with illegal number_of_shards
   - do:
       catch: /illegal_argument_exception/
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.clone:
         index: "source"
         target: "target"

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml
@@ -3,6 +3,7 @@
   - skip:
       version: " - 7.3.99"
       reason: index cloning was added in 7.4.0
+      features: allowed_warnings
   # create index
   - do:
       indices.create:
@@ -50,6 +51,8 @@
 
   # now we do the actual clone
   - do:
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.clone:
         index: "source"
         target: "target"

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml
@@ -3,7 +3,7 @@
   - skip:
       version: " - 7.3.99"
       reason: index cloning was added in 7.4.0
-      features: [arbitrary_key]
+      features: [arbitrary_key, allowed_warnings]
 
   - do:
       nodes.info:
@@ -36,6 +36,8 @@
 
   # now we do an actual clone and copy settings
   - do:
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.clone:
         index: "source"
         target: "copy-settings-target"

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml
@@ -7,6 +7,9 @@
   # which node is the one with the highest version and that is the only one that can safely
   # be used to shrink the index.
 
+  - skip:
+      features: allowed_warnings
+
   - do:
       nodes.info:
         node_id: data:true
@@ -53,6 +56,8 @@
 
   # now we do the actual shrink
   - do:
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.shrink:
         index: "source"
         target: "target"

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/20_source_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/20_source_mapping.yml
@@ -3,7 +3,7 @@
     - skip:
         version: " - 6.9.99"
         reason: expects warnings that pre-7.0.0 will not send
-        features: [warnings, arbitrary_key]
+        features: [warnings, arbitrary_key, allowed_warnings]
 
     - do:
         nodes.info:
@@ -60,6 +60,10 @@
 
     # now we do the actual shrink
     - do:
+        allowed_warnings:
+          - "Deprecated parameter [master_timeout] used. 
+        To promote inclusive language, please use [cluster_manager_timeout] instead. 
+        It will be unsupported in a future major version."
         indices.shrink:
           index: "source"
           target: "target"

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml
@@ -47,6 +47,7 @@
             index.merge.scheduler.max_thread_count: 2
       allowed_warnings:
         - "parameter [copy_settings] is deprecated and will be removed in 8.0.0"
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
 
   - do:
       cluster.health:
@@ -64,6 +65,8 @@
 
   # now we do a actual shrink and copy settings (by default)
   - do:
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.shrink:
         index: "source"
         target: "default-copy-settings-target"
@@ -91,6 +94,8 @@
   # now we do a actual shrink and try to set no copy settings
   - do:
       catch: /illegal_argument_exception/
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.shrink:
         index: "source"
         target: "explicit-no-copy-settings-target"

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml
@@ -29,6 +29,9 @@ setup:
 
 ---
 "Split index via API":
+  - skip:
+      features: allowed_warnings
+
   # make it read-only
   - do:
       indices.put_settings:
@@ -44,6 +47,8 @@ setup:
 
   # now we do the actual split
   - do:
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.split:
         index: "source"
         target: "target"
@@ -90,6 +95,8 @@ setup:
 
 ---
 "Split from 1 to N":
+  - skip:
+      features: allowed_warnings
   - do:
       indices.create:
         index: source_one_shard
@@ -131,6 +138,8 @@ setup:
 
   # now we do the actual split from 1 to 5
   - do:
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.split:
         index: "source_one_shard"
         target: "target"
@@ -176,9 +185,14 @@ setup:
 
 ---
 "Create illegal split indices":
+  - skip:
+      features: allowed_warnings
+
   # try to do an illegal split with number_of_routing_shards set
   - do:
       catch: /illegal_argument_exception/
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.split:
         index: "source"
         target: "target"
@@ -193,6 +207,8 @@ setup:
   # try to do an illegal split with illegal number_of_shards
   - do:
       catch: /illegal_state_exception/
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.split:
         index: "source"
         target: "target"

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/20_source_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/20_source_mapping.yml
@@ -1,5 +1,8 @@
 ---
 "Split index ignores target template mapping":
+  - skip:
+      features: allowed_warnings
+
   # create index
   - do:
       indices.create:
@@ -48,6 +51,8 @@
 
   # now we do the actual split
   - do:
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.split:
         index: "source"
         target: "target"

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml
@@ -49,6 +49,9 @@
             index.merge.scheduler.max_thread_count: 2
       allowed_warnings:
         - "parameter [copy_settings] is deprecated and will be removed in 8.0.0"
+        - "Deprecated parameter [master_timeout] used. 
+        To promote inclusive language, please use [cluster_manager_timeout] instead. 
+        It will be unsupported in a future major version."
 
 
   - do:
@@ -67,6 +70,8 @@
 
   # now we do a actual shrink and copy settings (by default)
   - do:
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.split:
         index: "source"
         target: "default-copy-settings-target"
@@ -94,6 +99,8 @@
 
   - do:
       catch: /illegal_argument_exception/
+      allowed_warnings:
+        - "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version."
       indices.split:
         index: "source"
         target: "explicit-no-copy-settings-target"

diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesAliasesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesAliasesAction.java
@@ -47,6 +47,7 @@
 import static org.opensearch.rest.RestRequest.Method.POST;
 
 public class RestIndicesAliasesAction extends BaseRestHandler {
+
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestIndicesAliasesAction.class);
 
     @Override