Skip to content

Commit 679a44d

Browse files
committed
Add timeout param parsing to start request
1 parent f2430ac commit 679a44d

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StartDataFrameTransformRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
public class StartDataFrameTransformRequest implements Validatable {
3030

3131
private final String id;
32-
// TODO The REST endpoint does not accept the timeout parameter yet
3332
private TimeValue timeout;
3433

3534
public StartDataFrameTransformRequest(String id) {

client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,6 @@ public void testStartStop() throws IOException, InterruptedException {
204204
request.setTimeout(TimeValue.timeValueSeconds(20)); // <1>
205205
// end::start-data-frame-transform-request-options
206206

207-
208-
// TODO null the timeout value until it is supported in the REST api
209-
request.setTimeout(null);
210-
211207
// tag::start-data-frame-transform-execute
212208
StartDataFrameTransformResponse response =
213209
client.dataFrame().startDataFrameTransform(

x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestStartDataFrameTransformAction.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
package org.elasticsearch.xpack.dataframe.rest.action;
88

9+
import org.elasticsearch.action.support.master.AcknowledgedRequest;
910
import org.elasticsearch.client.node.NodeClient;
1011
import org.elasticsearch.common.settings.Settings;
1112
import org.elasticsearch.rest.BaseRestHandler;
1213
import org.elasticsearch.rest.RestController;
1314
import org.elasticsearch.rest.RestRequest;
1415
import org.elasticsearch.rest.action.RestToXContentListener;
1516
import org.elasticsearch.xpack.core.dataframe.DataFrameField;
16-
import org.elasticsearch.xpack.core.rollup.RollupField;
1717
import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformAction;
1818

1919
import java.io.IOException;
@@ -27,9 +27,11 @@ public RestStartDataFrameTransformAction(Settings settings, RestController contr
2727

2828
@Override
2929
protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException {
30-
String id = restRequest.param(RollupField.ID.getPreferredName());
30+
String id = restRequest.param(DataFrameField.ID.getPreferredName());
3131
StartDataFrameTransformAction.Request request = new StartDataFrameTransformAction.Request(id);
32-
32+
if (restRequest.hasParam(DataFrameField.TIMEOUT.getPreferredName())) {
33+
request.timeout(restRequest.paramAsTime(DataFrameField.TIMEOUT.getPreferredName(), AcknowledgedRequest.DEFAULT_ACK_TIMEOUT));
34+
}
3335
return channel -> client.execute(StartDataFrameTransformAction.INSTANCE, request, new RestToXContentListener<>(channel));
3436
}
3537

x-pack/plugin/src/test/resources/rest-api-spec/api/data_frame.start_data_frame_transform.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@
1111
"required": true,
1212
"description": "The id of the transform to start"
1313
}
14+
},
15+
"params": {
16+
"timeout": {
17+
"type": "time",
18+
"required": false,
19+
"description": "Controls the time to wait for the transform to start"
20+
}
1421
}
1522
},
1623
"body": null

0 commit comments

Comments
 (0)