Skip to content

Commit b22b491

Browse files
committed
Making reindex data streams actions cancellable
1 parent f5c901e commit b22b491

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamAction.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
import org.elasticsearch.common.io.stream.StreamInput;
1717
import org.elasticsearch.common.io.stream.StreamOutput;
1818
import org.elasticsearch.features.NodeFeature;
19+
import org.elasticsearch.tasks.CancellableTask;
20+
import org.elasticsearch.tasks.Task;
21+
import org.elasticsearch.tasks.TaskId;
1922
import org.elasticsearch.xcontent.ConstructingObjectParser;
2023
import org.elasticsearch.xcontent.ParseField;
2124
import org.elasticsearch.xcontent.ToXContent;
@@ -24,6 +27,7 @@
2427

2528
import java.io.IOException;
2629
import java.util.Locale;
30+
import java.util.Map;
2731
import java.util.Objects;
2832
import java.util.function.Predicate;
2933

@@ -144,5 +148,10 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
144148
builder.endObject();
145149
return builder;
146150
}
151+
152+
@Override
153+
public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
154+
return new CancellableTask(id, type, action, "reindexing data stream " + sourceDataStream, parentTaskId, headers);
155+
}
147156
}
148157
}

x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamIndexAction.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
import org.elasticsearch.action.support.IndicesOptions;
1515
import org.elasticsearch.common.io.stream.StreamInput;
1616
import org.elasticsearch.common.io.stream.StreamOutput;
17+
import org.elasticsearch.tasks.CancellableTask;
18+
import org.elasticsearch.tasks.Task;
19+
import org.elasticsearch.tasks.TaskId;
1720

1821
import java.io.IOException;
22+
import java.util.Map;
1923
import java.util.Objects;
2024

2125
public class ReindexDataStreamIndexAction extends ActionType<ReindexDataStreamIndexAction.Response> {
@@ -78,6 +82,11 @@ public String[] indices() {
7882
public IndicesOptions indicesOptions() {
7983
return IndicesOptions.strictSingleIndexNoExpandForbidClosed();
8084
}
85+
86+
@Override
87+
public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
88+
return new CancellableTask(id, type, action, "reindexing data stream index " + sourceIndex, parentTaskId, headers);
89+
}
8190
}
8291

8392
public static class Response extends ActionResponse {

0 commit comments

Comments
 (0)