diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/RestDeleteShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/RestDeleteShutdownNodeAction.java index b762757541127..b97ea82d3d73f 100644 --- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/RestDeleteShutdownNodeAction.java +++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/RestDeleteShutdownNodeAction.java @@ -34,10 +34,8 @@ public boolean canTripCircuitBreaker() { @Override protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) { String nodeId = request.param("nodeId"); - return channel -> client.execute( - DeleteShutdownNodeAction.INSTANCE, - new DeleteShutdownNodeAction.Request(nodeId), - new RestToXContentListener<>(channel) - ); + final var parsedRequest = new DeleteShutdownNodeAction.Request(nodeId); + parsedRequest.masterNodeTimeout(request.paramAsTime("master_timeout", parsedRequest.masterNodeTimeout())); + return channel -> client.execute(DeleteShutdownNodeAction.INSTANCE, parsedRequest, new RestToXContentListener<>(channel)); } } diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/RestPutShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/RestPutShutdownNodeAction.java index 0f5ff1b19c8ef..a1a987b57b233 100644 --- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/RestPutShutdownNodeAction.java +++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/RestPutShutdownNodeAction.java @@ -38,7 +38,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli String nodeId = request.param("nodeId"); try (XContentParser parser = request.contentParser()) { PutShutdownNodeAction.Request parsedRequest = PutShutdownNodeAction.Request.parseRequest(nodeId, parser); - + parsedRequest.masterNodeTimeout(request.paramAsTime("master_timeout", parsedRequest.masterNodeTimeout())); return channel -> client.execute(PutShutdownNodeAction.INSTANCE, parsedRequest, new RestToXContentListener<>(channel)); } }