Skip to content

Commit ca33c0e

Browse files
authored
Making reindex data streams actions cancellable (elastic#122438) (elastic#122443)
1 parent 0bdf397 commit ca33c0e

File tree

3 files changed

+41
-0
lines changed

3 files changed

+41
-0
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
import org.elasticsearch.common.io.stream.StreamInput;
1616
import org.elasticsearch.common.io.stream.StreamOutput;
1717
import org.elasticsearch.common.settings.Settings;
18+
import org.elasticsearch.tasks.CancellableTask;
19+
import org.elasticsearch.tasks.Task;
20+
import org.elasticsearch.tasks.TaskId;
1821
import org.elasticsearch.xcontent.ObjectParser;
1922
import org.elasticsearch.xcontent.ParseField;
2023
import org.elasticsearch.xcontent.ToXContent;
@@ -191,5 +194,15 @@ public String[] indices() {
191194
public IndicesOptions indicesOptions() {
192195
return IndicesOptions.strictSingleIndexNoExpandForbidClosed();
193196
}
197+
198+
@Override
199+
public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
200+
return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers);
201+
}
202+
203+
@Override
204+
public String getDescription() {
205+
return "creating index " + destIndex + " from " + sourceIndex;
206+
}
194207
}
195208
}

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

Lines changed: 14 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,15 @@ 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, getDescription(), parentTaskId, headers);
155+
}
156+
157+
@Override
158+
public String getDescription() {
159+
return "reindexing data stream " + sourceDataStream;
160+
}
147161
}
148162
}

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

Lines changed: 14 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,16 @@ 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, getDescription(), parentTaskId, headers);
89+
}
90+
91+
@Override
92+
public String getDescription() {
93+
return "reindexing data stream index " + sourceIndex;
94+
}
8195
}
8296

8397
public static class Response extends ActionResponse {

0 commit comments

Comments
 (0)