Skip to content

Commit 39364c9

Browse files
original-brownbearoriginal-brownbear
committed
Merge remote-tracking branch 'elastic/main' into clever-holes-pages
2 parents f29e4f8 + 088f051 commit 39364c9

File tree

75 files changed

+204
-74
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+204
-74
lines changed

‎modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/rest/RestPutDataStreamLifecycleAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.List;
2323

2424
import static org.elasticsearch.rest.RestRequest.Method.PUT;
25+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
2526
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
2627

2728
@ServerlessScope(Scope.PUBLIC)
@@ -43,7 +44,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
4344
PutDataStreamLifecycleAction.Request putLifecycleRequest = PutDataStreamLifecycleAction.Request.parseRequest(parser);
4445
putLifecycleRequest.indices(Strings.splitStringByCommaToArray(request.param("name")));
4546
putLifecycleRequest.masterNodeTimeout(getMasterNodeTimeout(request));
46-
putLifecycleRequest.ackTimeout(request.paramAsTime("timeout", putLifecycleRequest.ackTimeout()));
47+
putLifecycleRequest.ackTimeout(getAckTimeout(request));
4748
putLifecycleRequest.indicesOptions(IndicesOptions.fromRequest(request, putLifecycleRequest.indicesOptions()));
4849
return channel -> client.execute(
4950
PutDataStreamLifecycleAction.INSTANCE,

‎modules/data-streams/src/main/java/org/elasticsearch/datastreams/rest/RestModifyDataStreamsAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.List;
2121

2222
import static org.elasticsearch.rest.RestRequest.Method.POST;
23+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
2324
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
2425

2526
@ServerlessScope(Scope.PUBLIC)
@@ -45,7 +46,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
4546
throw new IllegalArgumentException("no data stream actions specified, at least one must be specified");
4647
}
4748
modifyDsRequest.masterNodeTimeout(getMasterNodeTimeout(request));
48-
modifyDsRequest.ackTimeout(request.paramAsTime("timeout", modifyDsRequest.ackTimeout()));
49+
modifyDsRequest.ackTimeout(getAckTimeout(request));
4950
return channel -> client.execute(ModifyDataStreamsAction.INSTANCE, modifyDsRequest, new RestToXContentListener<>(channel));
5051
}
5152

‎server/src/main/java/org/elasticsearch/rest/RestUtils.java

+32
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88

99
package org.elasticsearch.rest;
1010

11+
import org.elasticsearch.action.support.master.AcknowledgedRequest;
1112
import org.elasticsearch.common.Strings;
1213
import org.elasticsearch.core.Booleans;
14+
import org.elasticsearch.core.Nullable;
1315
import org.elasticsearch.core.TimeValue;
1416

1517
import java.nio.charset.Charset;
@@ -20,6 +22,7 @@
2022
import java.util.function.UnaryOperator;
2123
import java.util.regex.Pattern;
2224

25+
import static org.elasticsearch.action.support.master.AcknowledgedRequest.DEFAULT_ACK_TIMEOUT;
2326
import static org.elasticsearch.rest.RestRequest.PATH_RESTRICTED;
2427

2528
public class RestUtils {
@@ -267,6 +270,11 @@ public static Optional<String> extractTraceId(String traceparent) {
267270
*/
268271
public static final TimeValue REST_MASTER_TIMEOUT_DEFAULT = TimeValue.timeValueSeconds(30);
269272

273+
/**
274+
* The name of the common {@code ?timeout} query parameter.
275+
*/
276+
public static final String REST_TIMEOUT_PARAM = "timeout";
277+
270278
/**
271279
* Extract the {@code ?master_timeout} parameter from the request, imposing the common default of {@code 30s} in case the parameter is
272280
* missing.
@@ -280,4 +288,28 @@ public static TimeValue getMasterNodeTimeout(RestRequest restRequest) {
280288
return restRequest.paramAsTime(REST_MASTER_TIMEOUT_PARAM, REST_MASTER_TIMEOUT_DEFAULT);
281289
}
282290

291+
/**
292+
* Extract the {@code ?timeout} parameter from the request, imposing the common default of {@code 30s} in case the parameter is
293+
* missing.
294+
*
295+
* @param restRequest The request from which to extract the {@code ?timeout} parameter
296+
* @return the timeout from the request, with a default of {@link AcknowledgedRequest#DEFAULT_ACK_TIMEOUT} ({@code 30s}) if the request
297+
* does not specify the parameter
298+
*/
299+
public static TimeValue getAckTimeout(RestRequest restRequest) {
300+
assert restRequest != null;
301+
return restRequest.paramAsTime(REST_TIMEOUT_PARAM, DEFAULT_ACK_TIMEOUT);
302+
}
303+
304+
/**
305+
* Extract the {@code ?timeout} parameter from the request, returning null in case the parameter is missing.
306+
*
307+
* @param restRequest The request from which to extract the {@code ?timeout} parameter
308+
* @return the timeout from the request, with a default of {@code null} if the request does not specify the parameter
309+
*/
310+
@Nullable
311+
public static TimeValue getTimeout(RestRequest restRequest) {
312+
assert restRequest != null;
313+
return restRequest.paramAsTime(REST_TIMEOUT_PARAM, null);
314+
}
283315
}

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCleanupRepositoryAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.List;
2121

2222
import static org.elasticsearch.rest.RestRequest.Method.POST;
23+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
2324
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
2425

2526
/**
@@ -42,7 +43,7 @@ public String getName() {
4243
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
4344
String name = request.param("repository");
4445
CleanupRepositoryRequest cleanupRepositoryRequest = new CleanupRepositoryRequest(name);
45-
cleanupRepositoryRequest.ackTimeout(request.paramAsTime("timeout", cleanupRepositoryRequest.ackTimeout()));
46+
cleanupRepositoryRequest.ackTimeout(getAckTimeout(request));
4647
cleanupRepositoryRequest.masterNodeTimeout(getMasterNodeTimeout(request));
4748
return channel -> client.admin().cluster().cleanupRepository(cleanupRepositoryRequest, new RestToXContentListener<>(channel));
4849
}

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
import static org.elasticsearch.common.util.set.Sets.addToCopy;
3333
import static org.elasticsearch.rest.RestRequest.Method.POST;
34+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
3435
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
3536

3637
@ServerlessScope(Scope.INTERNAL)
@@ -97,7 +98,7 @@ public static ClusterRerouteRequest createRequest(RestRequest request) throws IO
9798
ClusterRerouteRequest clusterRerouteRequest = new ClusterRerouteRequest();
9899
clusterRerouteRequest.dryRun(request.paramAsBoolean("dry_run", clusterRerouteRequest.dryRun()));
99100
clusterRerouteRequest.explain(request.paramAsBoolean("explain", clusterRerouteRequest.explain()));
100-
clusterRerouteRequest.ackTimeout(request.paramAsTime("timeout", clusterRerouteRequest.ackTimeout()));
101+
clusterRerouteRequest.ackTimeout(getAckTimeout(request));
101102
clusterRerouteRequest.setRetryFailed(request.paramAsBoolean("retry_failed", clusterRerouteRequest.isRetryFailed()));
102103
clusterRerouteRequest.masterNodeTimeout(getMasterNodeTimeout(request));
103104
request.applyContentParser(parser -> PARSER.parse(parser, clusterRerouteRequest, null));

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.List;
2222

2323
import static org.elasticsearch.rest.RestRequest.Method.GET;
24+
import static org.elasticsearch.rest.RestUtils.getTimeout;
2425

2526
@ServerlessScope(Scope.INTERNAL)
2627
public class RestClusterStatsAction extends BaseRestHandler {
@@ -38,7 +39,7 @@ public String getName() {
3839
@Override
3940
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
4041
ClusterStatsRequest clusterStatsRequest = new ClusterStatsRequest().nodesIds(request.paramAsStringArray("nodeId", null));
41-
clusterStatsRequest.timeout(request.paramAsTime("timeout", null));
42+
clusterStatsRequest.timeout(getTimeout(request));
4243
return channel -> new RestCancellableNodeClient(client, request.getHttpChannel()).admin()
4344
.cluster()
4445
.clusterStats(clusterStatsRequest, new NodesResponseRestListener<>(channel));

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Set;
2525

2626
import static org.elasticsearch.rest.RestRequest.Method.PUT;
27+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
2728
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
2829

2930
@ServerlessScope(Scope.INTERNAL)
@@ -45,7 +46,7 @@ public String getName() {
4546
@SuppressWarnings("unchecked")
4647
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
4748
final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest();
48-
clusterUpdateSettingsRequest.ackTimeout(request.paramAsTime("timeout", clusterUpdateSettingsRequest.ackTimeout()));
49+
clusterUpdateSettingsRequest.ackTimeout(getAckTimeout(request));
4950
clusterUpdateSettingsRequest.masterNodeTimeout(getMasterNodeTimeout(request));
5051
Map<String, Object> source;
5152
try (XContentParser parser = request.contentParser()) {

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.List;
2424

2525
import static org.elasticsearch.rest.RestRequest.Method.DELETE;
26+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
2627
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
2728

2829
/**
@@ -45,7 +46,7 @@ public String getName() {
4546
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
4647
String name = request.param("repository");
4748
DeleteRepositoryRequest deleteRepositoryRequest = new DeleteRepositoryRequest(name);
48-
deleteRepositoryRequest.ackTimeout(request.paramAsTime("timeout", deleteRepositoryRequest.ackTimeout()));
49+
deleteRepositoryRequest.ackTimeout(getAckTimeout(request));
4950
deleteRepositoryRequest.masterNodeTimeout(getMasterNodeTimeout(request));
5051
return channel -> client.admin()
5152
.cluster()

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.List;
2020

2121
import static org.elasticsearch.rest.RestRequest.Method.DELETE;
22+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
2223
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
2324

2425
@ServerlessScope(Scope.PUBLIC)
@@ -38,7 +39,7 @@ public String getName() {
3839
public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
3940
String id = request.param("id");
4041
DeleteStoredScriptRequest deleteStoredScriptRequest = new DeleteStoredScriptRequest(id);
41-
deleteStoredScriptRequest.ackTimeout(request.paramAsTime("timeout", deleteStoredScriptRequest.ackTimeout()));
42+
deleteStoredScriptRequest.ackTimeout(getAckTimeout(request));
4243
deleteStoredScriptRequest.masterNodeTimeout(getMasterNodeTimeout(request));
4344

4445
return channel -> client.admin().cluster().deleteStoredScript(deleteStoredScriptRequest, new RestToXContentListener<>(channel));

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.List;
2222

2323
import static org.elasticsearch.rest.RestRequest.Method.GET;
24+
import static org.elasticsearch.rest.RestUtils.getTimeout;
2425
import static org.elasticsearch.rest.Scope.PUBLIC;
2526

2627
@ServerlessScope(PUBLIC)
@@ -40,7 +41,7 @@ public String getName() {
4041
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
4142
TaskId taskId = new TaskId(request.param("task_id"));
4243
boolean waitForCompletion = request.paramAsBoolean("wait_for_completion", false);
43-
TimeValue timeout = request.paramAsTime("timeout", null);
44+
TimeValue timeout = getTimeout(request);
4445

4546
GetTaskRequest getTaskRequest = new GetTaskRequest();
4647
getTaskRequest.setTaskId(taskId);

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.function.Supplier;
2929

3030
import static org.elasticsearch.rest.RestRequest.Method.GET;
31+
import static org.elasticsearch.rest.RestUtils.getTimeout;
3132
import static org.elasticsearch.rest.Scope.INTERNAL;
3233

3334
@ServerlessScope(INTERNAL)
@@ -64,7 +65,7 @@ public static ListTasksRequest generateListTasksRequest(RestRequest request) {
6465
String[] actions = Strings.splitStringByCommaToArray(request.param("actions"));
6566
TaskId parentTaskId = new TaskId(request.param("parent_task_id"));
6667
boolean waitForCompletion = request.paramAsBoolean("wait_for_completion", false);
67-
TimeValue timeout = request.paramAsTime("timeout", null);
68+
TimeValue timeout = getTimeout(request);
6869

6970
ListTasksRequest listTasksRequest = new ListTasksRequest();
7071
listTasksRequest.setNodes(nodes);

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesCapabilitiesAction.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import java.util.List;
2525
import java.util.Set;
2626

27+
import static org.elasticsearch.rest.RestUtils.getTimeout;
28+
2729
@ServerlessScope(Scope.INTERNAL)
2830
public class RestNodesCapabilitiesAction extends BaseRestHandler {
2931

@@ -46,7 +48,7 @@ public String getName() {
4648

4749
@Override
4850
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
49-
NodesCapabilitiesRequest r = new NodesCapabilitiesRequest().timeout(request.paramAsTime("timeout", null))
51+
NodesCapabilitiesRequest r = new NodesCapabilitiesRequest().timeout(getTimeout(request))
5052
.method(RestRequest.Method.valueOf(request.param("method", "GET")))
5153
.path(URLDecoder.decode(request.param("path"), StandardCharsets.UTF_8))
5254
.parameters(request.paramAsStringArray("parameters", Strings.EMPTY_ARRAY))

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import static org.elasticsearch.rest.ChunkedRestResponseBody.fromTextChunks;
3131
import static org.elasticsearch.rest.RestRequest.Method.GET;
3232
import static org.elasticsearch.rest.RestResponse.TEXT_CONTENT_TYPE;
33+
import static org.elasticsearch.rest.RestUtils.getTimeout;
3334

3435
@ServerlessScope(Scope.INTERNAL)
3536
public class RestNodesHotThreadsAction extends BaseRestHandler {
@@ -111,7 +112,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
111112
);
112113
nodesHotThreadsRequest.interval(request.paramAsTime("interval", nodesHotThreadsRequest.interval()));
113114
nodesHotThreadsRequest.snapshots(request.paramAsInt("snapshots", nodesHotThreadsRequest.snapshots()));
114-
nodesHotThreadsRequest.timeout(request.paramAsTime("timeout", nodesHotThreadsRequest.timeout()));
115+
nodesHotThreadsRequest.timeout(getTimeout(request));
115116
return channel -> client.execute(TransportNodesHotThreadsAction.TYPE, nodesHotThreadsRequest, new RestResponseListener<>(channel) {
116117
@Override
117118
public RestResponse buildResponse(NodesHotThreadsResponse response) {

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.Set;
2727

2828
import static org.elasticsearch.rest.RestRequest.Method.GET;
29+
import static org.elasticsearch.rest.RestUtils.getTimeout;
2930

3031
@ServerlessScope(Scope.INTERNAL)
3132
public class RestNodesInfoAction extends BaseRestHandler {
@@ -86,7 +87,7 @@ static NodesInfoRequest prepareRequest(final RestRequest request) {
8687
}
8788

8889
final NodesInfoRequest nodesInfoRequest = new NodesInfoRequest(nodeIds);
89-
nodesInfoRequest.timeout(request.paramAsTime("timeout", null));
90+
nodesInfoRequest.timeout(getTimeout(request));
9091
// shortcut, don't do checks if only all is specified
9192
if (metrics.size() == 1 && metrics.contains("_all")) {
9293
nodesInfoRequest.all();

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.util.function.Consumer;
3636

3737
import static org.elasticsearch.rest.RestRequest.Method.GET;
38+
import static org.elasticsearch.rest.RestUtils.getTimeout;
3839

3940
@ServerlessScope(Scope.INTERNAL)
4041
public class RestNodesStatsAction extends BaseRestHandler {
@@ -90,7 +91,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
9091
Set<String> metrics = Strings.tokenizeByCommaToSet(request.param("metric", "_all"));
9192

9293
NodesStatsRequest nodesStatsRequest = new NodesStatsRequest(nodesIds);
93-
nodesStatsRequest.timeout(request.paramAsTime("timeout", null));
94+
nodesStatsRequest.timeout(getTimeout(request));
9495
// level parameter validation
9596
nodesStatsRequest.setIncludeShardsStats(NodeStatsLevel.of(request, NodeStatsLevel.NODE) != NodeStatsLevel.NODE);
9697

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.Set;
2929

3030
import static org.elasticsearch.rest.RestRequest.Method.GET;
31+
import static org.elasticsearch.rest.RestUtils.getTimeout;
3132

3233
@ServerlessScope(Scope.INTERNAL)
3334
public class RestNodesUsageAction extends BaseRestHandler {
@@ -48,7 +49,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
4849
Set<String> metrics = Strings.tokenizeByCommaToSet(request.param("metric", "_all"));
4950

5051
NodesUsageRequest nodesUsageRequest = new NodesUsageRequest(nodesIds);
51-
nodesUsageRequest.timeout(request.paramAsTime("timeout", null));
52+
nodesUsageRequest.timeout(getTimeout(request));
5253

5354
if (metrics.size() == 1 && metrics.contains("_all")) {
5455
nodesUsageRequest.all();

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import static org.elasticsearch.rest.RestRequest.Method.POST;
2727
import static org.elasticsearch.rest.RestRequest.Method.PUT;
28+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
2829
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
2930

3031
/**
@@ -52,7 +53,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
5253
}
5354
putRepositoryRequest.verify(request.paramAsBoolean("verify", true));
5455
putRepositoryRequest.masterNodeTimeout(getMasterNodeTimeout(request));
55-
putRepositoryRequest.ackTimeout(request.paramAsTime("timeout", putRepositoryRequest.ackTimeout()));
56+
putRepositoryRequest.ackTimeout(getAckTimeout(request));
5657
return channel -> client.admin()
5758
.cluster()
5859
.putRepository(

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import static org.elasticsearch.rest.RestRequest.Method.POST;
2525
import static org.elasticsearch.rest.RestRequest.Method.PUT;
26+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
2627
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
2728

2829
@ServerlessScope(Scope.PUBLIC)
@@ -53,7 +54,7 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client
5354

5455
PutStoredScriptRequest putRequest = new PutStoredScriptRequest(id, context, content, request.getXContentType(), source);
5556
putRequest.masterNodeTimeout(getMasterNodeTimeout(request));
56-
putRequest.ackTimeout(request.paramAsTime("timeout", putRequest.ackTimeout()));
57+
putRequest.ackTimeout(getAckTimeout(request));
5758
return channel -> client.admin().cluster().putStoredScript(putRequest, new RestToXContentListener<>(channel));
5859
}
5960
}

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.Set;
3333

3434
import static org.elasticsearch.rest.RestRequest.Method.POST;
35+
import static org.elasticsearch.rest.RestUtils.getTimeout;
3536

3637
public final class RestReloadSecureSettingsAction extends BaseRestHandler implements RestRequestFilter {
3738

@@ -63,7 +64,7 @@ public List<Route> routes() {
6364
public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
6465
final NodesReloadSecureSettingsRequest reloadSecureSettingsRequest = new NodesReloadSecureSettingsRequest();
6566
reloadSecureSettingsRequest.nodesIds(Strings.splitStringByCommaToArray(request.param("nodeId")));
66-
reloadSecureSettingsRequest.timeout(request.paramAsTime("timeout", null));
67+
reloadSecureSettingsRequest.timeout(getTimeout(request));
6768
request.withContentOrSourceParamParserOrNull(parser -> {
6869
if (parser != null) {
6970
final ParsedRequestBody parsedRequestBody = PARSER.parse(parser, null);

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.List;
2121

2222
import static org.elasticsearch.rest.RestRequest.Method.POST;
23+
import static org.elasticsearch.rest.RestUtils.getAckTimeout;
2324
import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
2425

2526
@ServerlessScope(Scope.INTERNAL)
@@ -40,7 +41,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
4041
String name = request.param("repository");
4142
VerifyRepositoryRequest verifyRepositoryRequest = new VerifyRepositoryRequest(name);
4243
verifyRepositoryRequest.masterNodeTimeout(getMasterNodeTimeout(request));
43-
verifyRepositoryRequest.ackTimeout(request.paramAsTime("timeout", verifyRepositoryRequest.ackTimeout()));
44+
verifyRepositoryRequest.ackTimeout(getAckTimeout(request));
4445
return channel -> client.admin().cluster().verifyRepository(verifyRepositoryRequest, new RestToXContentListener<>(channel));
4546
}
4647
}

0 commit comments

Comments
 (0)