Add ?master_node_timeout to RestDeprecationInfoAction (#108714)

Relates #107984
elastic · May 16, 2024 · e454165 · e454165
1 parent ca94162
commit e454165
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.../deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationInfoAction.java b/.../deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationInfoAction.java
@@ -24,6 +24,7 @@
 import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.set.Sets;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.transport.Transports;
@@ -330,8 +331,8 @@ public static class Request extends MasterNodeReadRequest<Request> implements In
         private static final IndicesOptions INDICES_OPTIONS = IndicesOptions.fromOptions(false, true, true, true);
         private String[] indices;
 
-        public Request(String... indices) {
-            super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+        public Request(TimeValue masterNodeTimeout, String... indices) {
+            super(masterNodeTimeout);
             this.indices = indices;
         }
 

diff --git a/...recation/src/main/java/org/elasticsearch/xpack/deprecation/RestDeprecationInfoAction.java b/...recation/src/main/java/org/elasticsearch/xpack/deprecation/RestDeprecationInfoAction.java
@@ -11,6 +11,7 @@
 import org.elasticsearch.core.RestApiVersion;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.RestUtils;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.xpack.deprecation.DeprecationInfoAction.Request;
 
@@ -46,7 +47,10 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client
     }
 
     private static RestChannelConsumer handleGet(final RestRequest request, NodeClient client) {
-        Request infoRequest = new Request(Strings.splitStringByCommaToArray(request.param("index")));
+        final var infoRequest = new Request(
+            RestUtils.getMasterNodeTimeout(request),
+            Strings.splitStringByCommaToArray(request.param("index"))
+        );
         return channel -> client.execute(DeprecationInfoAction.INSTANCE, infoRequest, new RestToXContentListener<>(channel));
     }
 }
diff --git a/.../src/test/java/org/elasticsearch/xpack/deprecation/DeprecationInfoActionRequestTests.java b/.../src/test/java/org/elasticsearch/xpack/deprecation/DeprecationInfoActionRequestTests.java
@@ -13,7 +13,7 @@ public class DeprecationInfoActionRequestTests extends AbstractWireSerializingTe
 
     @Override
     protected DeprecationInfoAction.Request createTestInstance() {
-        return new DeprecationInfoAction.Request(randomAlphaOfLength(10));
+        return new DeprecationInfoAction.Request(randomTimeValue(), randomAlphaOfLength(10));
     }
 
     @Override

diff --git a/...src/test/java/org/elasticsearch/xpack/deprecation/DeprecationInfoActionResponseTests.java b/...src/test/java/org/elasticsearch/xpack/deprecation/DeprecationInfoActionResponseTests.java
@@ -118,7 +118,7 @@ public void testFrom() throws IOException {
             emptyList()
         );
 
-        DeprecationInfoAction.Request request = new DeprecationInfoAction.Request(Strings.EMPTY_ARRAY);
+        DeprecationInfoAction.Request request = new DeprecationInfoAction.Request(randomTimeValue(), Strings.EMPTY_ARRAY);
         DeprecationInfoAction.Response response = DeprecationInfoAction.Response.from(
             state,
             resolver,
@@ -207,7 +207,7 @@ public void testFromWithMergeableNodeIssues() throws IOException {
             emptyList()
         );
 
-        DeprecationInfoAction.Request request = new DeprecationInfoAction.Request(Strings.EMPTY_ARRAY);
+        DeprecationInfoAction.Request request = new DeprecationInfoAction.Request(randomTimeValue(), Strings.EMPTY_ARRAY);
         DeprecationInfoAction.Response response = DeprecationInfoAction.Response.from(
             state,
             resolver,
@@ -263,7 +263,7 @@ public void testRemoveSkippedSettings() throws IOException {
             emptyList()
         );
 
-        DeprecationInfoAction.Request request = new DeprecationInfoAction.Request(Strings.EMPTY_ARRAY);
+        DeprecationInfoAction.Request request = new DeprecationInfoAction.Request(randomTimeValue(), Strings.EMPTY_ARRAY);
         DeprecationInfoAction.Response.from(
             state,
             resolver,