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

Jump to bottom

[ML] fixing bug where analytics process starts with 0 rows #45879

Merged
merged 10 commits into from
Aug 26, 2019
+96 −6
Merged

[ML] fixing bug where analytics process starts with 0 rows #45879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
37a640d
[ML] fixing bug where analytics process starts with 0 rows
benwtrent Aug 22, 2019
45b6761
Update AnalyticsProcessManager.java
benwtrent Aug 23, 2019
90ce01a
Adding validation at _start
benwtrent Aug 23, 2019
9b78f2e
Merge branch 'master' into bug/ml-fix-empty-source-analytics-_start
benwtrent Aug 23, 2019
a302e26
Update AnalyticsProcessConfig.java
benwtrent Aug 23, 2019
8ec589b
Update DataFrameDataExtractor.java
benwtrent Aug 23, 2019
93b3ff3
blacklisting test in ml-with-security
benwtrent Aug 23, 2019
d441464
Merge branch 'bug/ml-fix-empty-source-analytics-_start' of github.com…
benwtrent Aug 23, 2019
19cea1d
extract method for datasummary search request builder
benwtrent Aug 26, 2019
beadbd1
Merge branch 'master' into bug/ml-fix-empty-source-analytics-_start
elasticmachine Aug 26, 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
4 changes: 4 additions & 0 deletions ...ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/AnalyticsProcessConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ public int cols() {
return cols;
}

public long rows() {
return rows;
}

@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject();
Expand Down
11 changes: 10 additions & 1 deletion ...l/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/AnalyticsProcessManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.Strings;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.xpack.core.ClientHelper;
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig;
Expand Down Expand Up @@ -279,7 +280,15 @@ private synchronized boolean startProcess(DataFrameDataExtractorFactory dataExtr
}

dataExtractor = dataExtractorFactory.newExtractor(false);
process = createProcess(task, createProcessConfig(config, dataExtractor));
AnalyticsProcessConfig analyticsProcessConfig = createProcessConfig(config, dataExtractor);
LOGGER.trace("[{}] creating analytics process with config [{}]", config.getId(), Strings.toString(analyticsProcessConfig));
// If we have no rows, that means there is no data so no point in starting the native process
// just finish the task
if (analyticsProcessConfig.rows() == 0) {
LOGGER.info("[{}] no data found to analyze. Will not starting analytics native process.", config.getId());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/Will not starting/Will not start/
?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@przemekwitek hahah! Yep! Let me fix the grammar :D

return false;
}
process = createProcess(task, analyticsProcessConfig);
DataFrameRowsJoiner dataFrameRowsJoiner = new DataFrameRowsJoiner(config.getId(), client,
dataExtractorFactory.newExtractor(true));
resultProcessor = new AnalyticsResultProcessor(id, dataFrameRowsJoiner, this::isProcessKilled, this::setProgressPercent);
Expand Down