Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x][ML] Avoid marking data frame analytics task completed twice (#4… #46724

Merged
merged 1 commit into from
Sep 15, 2019
Merged

[7.x][ML] Avoid marking data frame analytics task completed twice (#4… #46724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions ...ugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DataFrameAnalyticsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexAction;
Expand Down Expand Up @@ -78,7 +79,13 @@ public void execute(DataFrameAnalyticsTask task, DataFrameAnalyticsState current
case STARTED:
task.updatePersistentTaskState(reindexingState, ActionListener.wrap(
updatedTask -> reindexingStateListener.onResponse(config),
reindexingStateListener::onFailure));
error -> {
if (error instanceof ResourceNotFoundException) {
// The task has been stopped
} else {
reindexingStateListener.onFailure(error);
}
}));
break;
// The task has fully reindexed the documents and we should continue on with our analyses
case ANALYZING:
Expand Down Expand Up @@ -221,7 +228,13 @@ private void startAnalytics(DataFrameAnalyticsTask task, DataFrameAnalyticsConfi
task.markAsCompleted();
}
}),
error -> task.updateState(DataFrameAnalyticsState.FAILED, error.getMessage())
error -> {
if (error instanceof ResourceNotFoundException) {
// Task has stopped
} else {
task.updateState(DataFrameAnalyticsState.FAILED, error.getMessage());
}
}
));
},
error -> task.updateState(DataFrameAnalyticsState.FAILED, error.getMessage())
Expand Down
7 changes: 6 additions & 1 deletion .../plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DataFrameAnalyticsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@ protected void onCancelled() {

@Override
public void markAsCompleted() {
persistProgress(() -> super.markAsCompleted());
// It is possible that the stop API has been called in the meantime and that
// may also cause this method to be called. We check whether we have already
// been marked completed to avoid doing it twice.
if (isCompleted() == false) {
persistProgress(() -> super.markAsCompleted());
}
}

@Override
Expand Down