mirrors
/
elasticsearch
mirror of https://mirror.osredm.com/root/elasticsearch.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ML] add timeout parameter for DELETE trained_models API (#79739) 

DELETE trained models should allow timeout parameter to override the current default of 30s

closes: #77070
This commit is contained in:
Benjamin Trent 2021-10-26 07:23:08 -04:00 committed by GitHub
parent 17727e590c
commit da25a35de4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_trained_model.json
View File

@ -24,6 +24,14 @@
}
}
]
},
"params":{
"timeout":{
"type":"time",
"required":false,
"description":"Controls the amount of time to wait for the model to be deleted.",
"default": "30s"
}
}
}
}

7
x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/inference/RestDeleteTrainedModelAction.java
View File

@ -6,8 +6,10 @@
*/
package org.elasticsearch.xpack.ml.rest.inference;
import org.elasticsearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.core.RestApiVersion;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.action.RestToXContentListener;
@ -18,6 +20,7 @@ import java.io.IOException;
import java.util.List;
import static org.elasticsearch.rest.RestRequest.Method.DELETE;
import static org.elasticsearch.xpack.core.ml.action.StartTrainedModelDeploymentAction.Request.TIMEOUT;
import static org.elasticsearch.xpack.ml.MachineLearning.BASE_PATH;
public class RestDeleteTrainedModelAction extends BaseRestHandler {
@ -39,6 +42,10 @@ public class RestDeleteTrainedModelAction extends BaseRestHandler {
protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException {
String modelId = restRequest.param(TrainedModelConfig.MODEL_ID.getPreferredName());
DeleteTrainedModelAction.Request request = new DeleteTrainedModelAction.Request(modelId);
if (restRequest.hasParam(TIMEOUT.getPreferredName())) {
TimeValue timeout = restRequest.paramAsTime(TIMEOUT.getPreferredName(), AcknowledgedRequest.DEFAULT_ACK_TIMEOUT);
request.timeout(timeout);
}
return channel -> client.execute(DeleteTrainedModelAction.INSTANCE, request, new RestToXContentListener<>(channel));
}
}