Skip to content

Commit 29dce71

Browse files
benwtrentGurkan Kaymak
authored and
Gurkan Kaymak
committed
[ML] refactoring start task a bit, removing unused code (elastic#40798)
1 parent 7c0514e commit 29dce71

File tree

7 files changed

+67
-703
lines changed

7 files changed

+67
-703
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskAction.java

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.elasticsearch.common.io.stream.Writeable;
1616
import org.elasticsearch.common.xcontent.ToXContentObject;
1717
import org.elasticsearch.common.xcontent.XContentBuilder;
18+
import org.elasticsearch.tasks.Task;
1819
import org.elasticsearch.xpack.core.dataframe.DataFrameField;
1920
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
2021

@@ -62,6 +63,11 @@ public void writeTo(StreamOutput out) throws IOException {
6263
out.writeString(id);
6364
}
6465

66+
@Override
67+
public boolean match(Task task) {
68+
return task.getDescription().equals(DataFrameField.PERSISTENT_TASK_DESCRIPTION_PREFIX + id);
69+
}
70+
6571
@Override
6672
public ActionRequestValidationException validate() {
6773
return null;

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

-22
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.elasticsearch.xpack.dataframe.transforms.DataFrameTransformTask;
2525

2626
import java.util.List;
27-
import java.util.function.Consumer;
2827

2928
/**
3029
* Internal only transport class to change an allocated persistent task's state to started
@@ -44,27 +43,6 @@ public TransportStartDataFrameTransformTaskAction(TransportService transportServ
4443
this.licenseState = licenseState;
4544
}
4645

47-
@Override
48-
protected void processTasks(StartDataFrameTransformTaskAction.Request request, Consumer<DataFrameTransformTask> operation) {
49-
DataFrameTransformTask matchingTask = null;
50-
51-
// todo: re-factor, see rollup TransportTaskHelper
52-
for (Task task : taskManager.getTasks().values()) {
53-
if (task instanceof DataFrameTransformTask
54-
&& ((DataFrameTransformTask) task).getTransformId().equals(request.getId())) {
55-
if (matchingTask != null) {
56-
throw new IllegalArgumentException("Found more than one matching task for data frame transform [" + request.getId()
57-
+ "] when " + "there should only be one.");
58-
}
59-
matchingTask = (DataFrameTransformTask) task;
60-
}
61-
}
62-
63-
if (matchingTask != null) {
64-
operation.accept(matchingTask);
65-
}
66-
}
67-
6846
@Override
6947
protected void doExecute(Task task, StartDataFrameTransformTaskAction.Request request,
7048
ActionListener<StartDataFrameTransformTaskAction.Response> listener) {

x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFramePersistentTaskUtils.java

-41
This file was deleted.

x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/util/BatchedDataIterator.java

-186
This file was deleted.

0 commit comments

Comments
 (0)