Skip to content

Commit 5172b58

Browse files
[ML] Use non-zero timeout when force stopping DF analytics (#56423)
We have been using a zero timeout in the case that DF analytics is stopped. This may cause a timeout when we cancel, for example, the reindex task. This commit fixes this by using the default timeout instead.
1 parent fd437ca commit 5172b58

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DataFrameAnalyticsTask.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.elasticsearch.xpack.core.ml.MlTasks;
3939
import org.elasticsearch.xpack.core.ml.action.GetDataFrameAnalyticsStatsAction;
4040
import org.elasticsearch.xpack.core.ml.action.StartDataFrameAnalyticsAction;
41+
import org.elasticsearch.xpack.core.ml.action.StopDataFrameAnalyticsAction;
4142
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsState;
4243
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsTaskState;
4344
import org.elasticsearch.xpack.core.ml.job.messages.Messages;
@@ -107,7 +108,7 @@ public StatsHolder getStatsHolder() {
107108

108109
@Override
109110
protected void onCancelled() {
110-
stop(getReasonCancelled(), TimeValue.ZERO);
111+
stop(getReasonCancelled(), StopDataFrameAnalyticsAction.DEFAULT_TIMEOUT);
111112
markAsCompleted();
112113
}
113114

0 commit comments

Comments
 (0)