Skip to content

Commit 8686648

Browse files
committed
PR Fixes - Make enable / disable endpoint cancellable
1 parent 88165ac commit 8686648

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

modules/streams/src/main/java/org/elasticsearch/rest/streams/logs/LogsStreamsActivationToggleAction.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@
99

1010
package org.elasticsearch.rest.streams.logs;
1111

12-
import org.elasticsearch.action.ActionRequestValidationException;
1312
import org.elasticsearch.action.ActionType;
1413
import org.elasticsearch.action.support.master.AcknowledgedRequest;
1514
import org.elasticsearch.action.support.master.AcknowledgedResponse;
1615
import org.elasticsearch.common.io.stream.StreamInput;
1716
import org.elasticsearch.common.io.stream.StreamOutput;
1817
import org.elasticsearch.core.TimeValue;
18+
import org.elasticsearch.tasks.CancellableTask;
19+
import org.elasticsearch.tasks.Task;
20+
import org.elasticsearch.tasks.TaskId;
1921

2022
import java.io.IOException;
23+
import java.util.Map;
2124

2225
public class LogsStreamsActivationToggleAction {
2326

@@ -43,11 +46,6 @@ public void writeTo(StreamOutput out) throws IOException {
4346
out.writeBoolean(enable);
4447
}
4548

46-
@Override
47-
public ActionRequestValidationException validate() {
48-
return null;
49-
}
50-
5149
@Override
5250
public String toString() {
5351
return "LogsStreamsActivationToggleAction.Request{" + "enable=" + enable + '}';
@@ -56,5 +54,10 @@ public String toString() {
5654
public boolean shouldEnable() {
5755
return enable;
5856
}
57+
58+
@Override
59+
public Task createTask(String localNodeId, long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
60+
return new CancellableTask(id, type, action, "Logs streams activation toggle request", parentTaskId, headers);
61+
}
5962
}
6063
}

modules/streams/src/main/java/org/elasticsearch/rest/streams/logs/RestSetLogStreamsEnabledAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.elasticsearch.rest.RestUtils;
1616
import org.elasticsearch.rest.Scope;
1717
import org.elasticsearch.rest.ServerlessScope;
18+
import org.elasticsearch.rest.action.RestCancellableNodeClient;
1819
import org.elasticsearch.rest.action.RestToXContentListener;
1920

2021
import java.util.List;
@@ -48,7 +49,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
4849
enabled
4950
);
5051

51-
return restChannel -> client.execute(
52+
return restChannel -> new RestCancellableNodeClient(client, request.getHttpChannel()).execute(
5253
LogsStreamsActivationToggleAction.INSTANCE,
5354
activationRequest,
5455
new RestToXContentListener<>(restChannel)

0 commit comments

Comments
 (0)