Skip to content

Verify that the failure reason of analytics process is empty #48042

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

Merged
merged 3 commits into from
Oct 15, 2019
Merged

Verify that the failure reason of analytics process is empty #48042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e8e038
Verify that the failure reason of analytics process is empty
przemekwitek Oct 15, 2019
af65ba8
Apply review comments
przemekwitek Oct 15, 2019
1b9cbbb
Fix compile error
przemekwitek Oct 15, 2019
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
5 changes: 5 additions & 0 deletions ...rc/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsStatsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,10 @@ public DataFrameAnalyticsState getState() {
return state;
}

public String getFailureReason() {
return failureReason;
}

public List<PhaseProgress> getProgress() {
return progress;
}
Expand Down Expand Up @@ -340,6 +344,7 @@ public boolean equals(Object obj) {
return Objects.equals(id, other.id)
&& Objects.equals(this.state, other.state)
&& Objects.equals(this.failureReason, other.failureReason)
&& Objects.equals(this.progress, other.progress)
&& Objects.equals(this.node, other.node)
&& Objects.equals(this.assignmentExplanation, other.assignmentExplanation);
}
Expand Down
9 changes: 4 additions & 5 deletions ...lti-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig;
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsState;
import org.elasticsearch.xpack.core.ml.dataframe.analyses.BoostedTreeParamsTests;
import org.elasticsearch.xpack.core.ml.dataframe.analyses.Classification;
import org.junit.After;
Expand Down Expand Up @@ -60,7 +59,7 @@ public void testSingleNumericFeatureAndMixedTrainingAndNonTrainingRows() throws
registerAnalytics(config);
putAnalytics(config);

assertState(jobId, DataFrameAnalyticsState.STOPPED);
assertIsStopped(jobId);
assertProgress(jobId, 0, 0, 0, 0);

startAnalytics(jobId);
Expand Down Expand Up @@ -98,7 +97,7 @@ public void testWithOnlyTrainingRowsAndTrainingPercentIsHundred() throws Excepti
registerAnalytics(config);
putAnalytics(config);

assertState(jobId, DataFrameAnalyticsState.STOPPED);
assertIsStopped(jobId);
assertProgress(jobId, 0, 0, 0, 0);

startAnalytics(jobId);
Expand Down Expand Up @@ -141,7 +140,7 @@ public void testWithOnlyTrainingRowsAndTrainingPercentIsFifty() throws Exception
registerAnalytics(config);
putAnalytics(config);

assertState(jobId, DataFrameAnalyticsState.STOPPED);
assertIsStopped(jobId);
assertProgress(jobId, 0, 0, 0, 0);

startAnalytics(jobId);
Expand Down Expand Up @@ -194,7 +193,7 @@ public void testSingleNumericFeatureAndMixedTrainingAndNonTrainingRows_TopClasse
registerAnalytics(config);
putAnalytics(config);

assertState(jobId, DataFrameAnalyticsState.STOPPED);
assertIsStopped(jobId);
assertProgress(jobId, 0, 0, 0, 0);

startAnalytics(jobId);
Expand Down
27 changes: 14 additions & 13 deletions .../java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.startsWith;

/**
Expand Down Expand Up @@ -119,20 +120,21 @@ protected void waitUntilAnalyticsIsStopped(String id) throws Exception {
}

protected void waitUntilAnalyticsIsStopped(String id, TimeValue waitTime) throws Exception {
assertBusy(() -> assertThat(getAnalyticsStats(id).get(0).getState(), equalTo(DataFrameAnalyticsState.STOPPED)),
waitTime.getMillis(), TimeUnit.MILLISECONDS);
assertBusy(() -> assertIsStopped(id), waitTime.getMillis(), TimeUnit.MILLISECONDS);
}

protected List<DataFrameAnalyticsConfig> getAnalytics(String id) {
GetDataFrameAnalyticsAction.Request request = new GetDataFrameAnalyticsAction.Request(id);
return client().execute(GetDataFrameAnalyticsAction.INSTANCE, request).actionGet().getResources().results();
}

protected List<GetDataFrameAnalyticsStatsAction.Response.Stats> getAnalyticsStats(String id) {
protected GetDataFrameAnalyticsStatsAction.Response.Stats getAnalyticsStats(String id) {
GetDataFrameAnalyticsStatsAction.Request request = new GetDataFrameAnalyticsStatsAction.Request(id);
GetDataFrameAnalyticsStatsAction.Response response = client().execute(GetDataFrameAnalyticsStatsAction.INSTANCE, request)
.actionGet();
return response.getResponse().results();
List<GetDataFrameAnalyticsStatsAction.Response.Stats> stats = response.getResponse().results();
assertThat("Got: " + stats.toString(), stats.size(), equalTo(1));
return stats.get(0);
}

protected static DataFrameAnalyticsConfig buildAnalytics(String id, String sourceIndex, String destIndex,
Expand All @@ -145,18 +147,17 @@ protected static DataFrameAnalyticsConfig buildAnalytics(String id, String sourc
return configBuilder.build();
}

protected void assertState(String id, DataFrameAnalyticsState state) {
List<GetDataFrameAnalyticsStatsAction.Response.Stats> stats = getAnalyticsStats(id);
assertThat(stats.size(), equalTo(1));
assertThat(stats.get(0).getId(), equalTo(id));
assertThat(stats.get(0).getState(), equalTo(state));
protected void assertIsStopped(String id) {
GetDataFrameAnalyticsStatsAction.Response.Stats stats = getAnalyticsStats(id);
assertThat(stats.getId(), equalTo(id));
assertThat(stats.getFailureReason(), is(nullValue()));
assertThat(stats.getState(), equalTo(DataFrameAnalyticsState.STOPPED));
}

protected void assertProgress(String id, int reindexing, int loadingData, int analyzing, int writingResults) {
List<GetDataFrameAnalyticsStatsAction.Response.Stats> stats = getAnalyticsStats(id);
List<PhaseProgress> progress = stats.get(0).getProgress();
assertThat(stats.size(), equalTo(1));
assertThat(stats.get(0).getId(), equalTo(id));
GetDataFrameAnalyticsStatsAction.Response.Stats stats = getAnalyticsStats(id);
assertThat(stats.getId(), equalTo(id));
List<PhaseProgress> progress = stats.getProgress();
assertThat(progress.size(), equalTo(4));
assertThat(progress.get(0).getPhase(), equalTo("reindexing"));
assertThat(progress.get(1).getPhase(), equalTo("loading_data"));
Expand Down
3 changes: 1 addition & 2 deletions ...test/java/org/elasticsearch/xpack/ml/integration/OutlierDetectionWithMissingFieldsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig;
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsState;
import org.elasticsearch.xpack.core.ml.dataframe.analyses.OutlierDetection;
import org.junit.After;

Expand Down Expand Up @@ -74,7 +73,7 @@ public void testMissingFields() throws Exception {
registerAnalytics(config);
putAnalytics(config);

assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
assertProgress(id, 0, 0, 0, 0);

startAnalytics(id);
Expand Down
10 changes: 5 additions & 5 deletions ...e-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void testSingleNumericFeatureAndMixedTrainingAndNonTrainingRows() throws
registerAnalytics(config);
putAnalytics(config);

assertState(jobId, DataFrameAnalyticsState.STOPPED);
assertIsStopped(jobId);
assertProgress(jobId, 0, 0, 0, 0);

startAnalytics(jobId);
Expand Down Expand Up @@ -141,7 +141,7 @@ public void testWithOnlyTrainingRowsAndTrainingPercentIsHundred() throws Excepti
registerAnalytics(config);
putAnalytics(config);

assertState(jobId, DataFrameAnalyticsState.STOPPED);
assertIsStopped(jobId);
assertProgress(jobId, 0, 0, 0, 0);

startAnalytics(jobId);
Expand Down Expand Up @@ -199,7 +199,7 @@ public void testWithOnlyTrainingRowsAndTrainingPercentIsFifty() throws Exception
registerAnalytics(config);
putAnalytics(config);

assertState(jobId, DataFrameAnalyticsState.STOPPED);
assertIsStopped(jobId);
assertProgress(jobId, 0, 0, 0, 0);

startAnalytics(jobId);
Expand Down Expand Up @@ -259,14 +259,14 @@ public void testStopAndRestart() throws Exception {
registerAnalytics(config);
putAnalytics(config);

assertState(jobId, DataFrameAnalyticsState.STOPPED);
assertIsStopped(jobId);
assertProgress(jobId, 0, 0, 0, 0);

startAnalytics(jobId);

// Wait until state is one of REINDEXING or ANALYZING, or until it is STOPPED.
assertBusy(() -> {
DataFrameAnalyticsState state = getAnalyticsStats(jobId).get(0).getState();
DataFrameAnalyticsState state = getAnalyticsStats(jobId).getState();
assertThat(state, is(anyOf(equalTo(DataFrameAnalyticsState.REINDEXING), equalTo(DataFrameAnalyticsState.ANALYZING),
equalTo(DataFrameAnalyticsState.STOPPED))));
});
Expand Down
26 changes: 13 additions & 13 deletions ...e-tests/src/test/java/org/elasticsearch/xpack/ml/integration/RunDataFrameAnalyticsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void testOutlierDetectionWithFewDocuments() throws Exception {
registerAnalytics(config);
putAnalytics(config);

assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
assertProgress(id, 0, 0, 0, 0);

startAnalytics(id);
Expand Down Expand Up @@ -157,7 +157,7 @@ public void testOutlierDetectionWithEnoughDocumentsToScroll() throws Exception {
registerAnalytics(config);
putAnalytics(config);

assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
assertProgress(id, 0, 0, 0, 0);

startAnalytics(id);
Expand Down Expand Up @@ -228,7 +228,7 @@ public void testOutlierDetectionWithMoreFieldsThanDocValueFieldLimit() throws Ex
registerAnalytics(config);
putAnalytics(config);

assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
assertProgress(id, 0, 0, 0, 0);

startAnalytics(id);
Expand Down Expand Up @@ -293,12 +293,12 @@ public void testStopOutlierDetectionWithEnoughDocumentsToScroll() throws Excepti
registerAnalytics(config);
putAnalytics(config);

assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
startAnalytics(id);
// State here could be any of STARTED, REINDEXING or ANALYZING

assertThat(stopAnalytics(id).isStopped(), is(true));
assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
if (indexExists(config.getDest().getIndex()) == false) {
// We stopped before we even created the destination index
return;
Expand Down Expand Up @@ -363,7 +363,7 @@ public void testOutlierDetectionWithMultipleSourceIndices() throws Exception {
registerAnalytics(config);
putAnalytics(config);

assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
assertProgress(id, 0, 0, 0, 0);

startAnalytics(id);
Expand Down Expand Up @@ -421,7 +421,7 @@ public void testOutlierDetectionWithPreExistingDestIndex() throws Exception {
registerAnalytics(config);
putAnalytics(config);

assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
assertProgress(id, 0, 0, 0, 0);

startAnalytics(id);
Expand Down Expand Up @@ -480,7 +480,7 @@ public void testModelMemoryLimitLowerThanEstimatedMemoryUsage() throws Exception

registerAnalytics(config);
putAnalytics(config);
assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);

ElasticsearchStatusException exception = expectThrows(ElasticsearchStatusException.class, () -> startAnalytics(id));
assertThat(exception.status(), equalTo(RestStatus.BAD_REQUEST));
Expand Down Expand Up @@ -525,14 +525,14 @@ public void testLazyAssignmentWithModelMemoryLimitTooHighForAssignment() throws

registerAnalytics(config);
putAnalytics(config);
assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);

// Due to lazy start being allowed, this should succeed even though no node currently in the cluster is big enough
startAnalytics(id);

// Wait until state is STARTING, there is no node but there is an assignment explanation.
assertBusy(() -> {
GetDataFrameAnalyticsStatsAction.Response.Stats stats = getAnalyticsStats(id).get(0);
GetDataFrameAnalyticsStatsAction.Response.Stats stats = getAnalyticsStats(id);
assertThat(stats.getState(), equalTo(DataFrameAnalyticsState.STARTING));
assertThat(stats.getNode(), is(nullValue()));
assertThat(stats.getAssignmentExplanation(), containsString("persistent task is awaiting node assignment"));
Expand Down Expand Up @@ -576,12 +576,12 @@ public void testOutlierDetectionStopAndRestart() throws Exception {
registerAnalytics(config);
putAnalytics(config);

assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
startAnalytics(id);

// Wait until state is one of REINDEXING or ANALYZING, or until it is STOPPED.
assertBusy(() -> {
DataFrameAnalyticsState state = getAnalyticsStats(id).get(0).getState();
DataFrameAnalyticsState state = getAnalyticsStats(id).getState();
assertThat(state, is(anyOf(equalTo(DataFrameAnalyticsState.REINDEXING), equalTo(DataFrameAnalyticsState.ANALYZING),
equalTo(DataFrameAnalyticsState.STOPPED))));
});
Expand Down Expand Up @@ -652,7 +652,7 @@ public void testOutlierDetectionWithCustomParams() throws Exception {
registerAnalytics(config);
putAnalytics(config);

assertState(id, DataFrameAnalyticsState.STOPPED);
assertIsStopped(id);
assertProgress(id, 0, 0, 0, 0);

startAnalytics(id);
Expand Down