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

[ML] Uplift model memory limit on job migration #37126

Merged
merged 2 commits into from
Jan 4, 2019
Merged

[ML] Uplift model memory limit on job migration #37126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d77148
[ML] Uplift model memory limit on job migration
droberts195 Jan 3, 2019
4053098
Merge branch 'master' into fix_model_memory_uplift_on_migrate_master
droberts195 Jan 4, 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
15 changes: 14 additions & 1 deletion x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.elasticsearch.xpack.core.ml.MlMetadata;
import org.elasticsearch.xpack.core.ml.MlTasks;
import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig;
import org.elasticsearch.xpack.core.ml.job.config.AnalysisLimits;
import org.elasticsearch.xpack.core.ml.job.config.Job;
import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndex;
import org.elasticsearch.xpack.core.ml.job.persistence.ElasticsearchMappings;
Expand Down Expand Up @@ -403,11 +404,23 @@ public static Job updateJobForMigration(Job job) {
Map<String, Object> custom = job.getCustomSettings() == null ? new HashMap<>() : new HashMap<>(job.getCustomSettings());
custom.put(MIGRATED_FROM_VERSION, job.getJobVersion());
builder.setCustomSettings(custom);
// Increase the model memory limit for 6.1 - 6.3 jobs
Version jobVersion = job.getJobVersion();
if (jobVersion != null && jobVersion.onOrAfter(Version.V_6_1_0) && jobVersion.before(Version.V_6_3_0)) {
// Increase model memory limit if < 512MB
if (job.getAnalysisLimits() != null && job.getAnalysisLimits().getModelMemoryLimit() != null &&
job.getAnalysisLimits().getModelMemoryLimit() < 512L) {
long updatedModelMemoryLimit = (long) (job.getAnalysisLimits().getModelMemoryLimit() * 1.3);
AnalysisLimits limits = new AnalysisLimits(updatedModelMemoryLimit,
job.getAnalysisLimits().getCategorizationExamplesLimit());
builder.setAnalysisLimits(limits);
}
}
// Pre v5.5 (ml beta) jobs do not have a version.
// These jobs cannot be opened, we rely on the missing version
// to indicate this.
// See TransportOpenJobAction.validate()
if (job.getJobVersion() != null) {
if (jobVersion != null) {
builder.setJobVersion(Version.CURRENT);
}
return builder.build();
Expand Down
41 changes: 2 additions & 39 deletions x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportOpenJobAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@
import org.elasticsearch.xpack.core.ml.MlTasks;
import org.elasticsearch.xpack.core.ml.action.FinalizeJobExecutionAction;
import org.elasticsearch.xpack.core.ml.action.OpenJobAction;
import org.elasticsearch.xpack.core.ml.action.PutJobAction;
import org.elasticsearch.xpack.core.ml.action.UpdateJobAction;
import org.elasticsearch.xpack.core.ml.job.config.AnalysisLimits;
import org.elasticsearch.xpack.core.ml.job.config.DetectionRule;
import org.elasticsearch.xpack.core.ml.job.config.Job;
import org.elasticsearch.xpack.core.ml.job.config.JobState;
Expand Down Expand Up @@ -540,50 +537,16 @@ public void onFailure(Exception e) {
);

// Tell the job tracker to refresh the memory requirement for this job and all other jobs that have persistent tasks
ActionListener<PutJobAction.Response> jobUpdateListener = ActionListener.wrap(
ActionListener<Boolean> jobUpdateListener = ActionListener.wrap(
response -> memoryTracker.refreshJobMemoryAndAllOthers(jobParams.getJobId(), memoryRequirementRefreshListener),
listener::onFailure
);

// Increase the model memory limit for 6.1 - 6.3 jobs
ActionListener<Boolean> missingMappingsListener = ActionListener.wrap(
response -> {
Job job = jobParams.getJob();
if (job != null) {
Version jobVersion = job.getJobVersion();
if (jobVersion != null &&
(jobVersion.onOrAfter(Version.V_6_1_0) && jobVersion.before(Version.V_6_3_0))) {
// Increase model memory limit if < 512MB
if (job.getAnalysisLimits() != null && job.getAnalysisLimits().getModelMemoryLimit() != null &&
job.getAnalysisLimits().getModelMemoryLimit() < 512L) {

long updatedModelMemoryLimit = (long) (job.getAnalysisLimits().getModelMemoryLimit() * 1.3);
AnalysisLimits limits = new AnalysisLimits(updatedModelMemoryLimit,
job.getAnalysisLimits().getCategorizationExamplesLimit());

JobUpdate update = new JobUpdate.Builder(job.getId()).setJobVersion(Version.CURRENT)
.setAnalysisLimits(limits).build();
UpdateJobAction.Request updateRequest = UpdateJobAction.Request.internal(job.getId(), update);
executeAsyncWithOrigin(client, ML_ORIGIN, UpdateJobAction.INSTANCE, updateRequest,
jobUpdateListener);
} else {
jobUpdateListener.onResponse(null);
}
}
else {
jobUpdateListener.onResponse(null);
}
} else {
jobUpdateListener.onResponse(null);
}
}, listener::onFailure
);

// Try adding state doc mapping
ActionListener<Boolean> resultsPutMappingHandler = ActionListener.wrap(
response -> {
addDocMappingIfMissing(AnomalyDetectorsIndex.jobStateIndexName(), ElasticsearchMappings::stateMapping,
state, missingMappingsListener);
state, jobUpdateListener);
}, listener::onFailure
);

Expand Down