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] In 8.x ML will have to tolerate model snapshots for 6.4.0+ #81039

Merged
merged 2 commits into from
Nov 25, 2021
Merged

[ML] In 8.x ML will have to tolerate model snapshots for 6.4.0+ #81039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dc0825
[ML] In 8.x ML will have to tolerate model snapshots for 6.4.0+
droberts195 Nov 25, 2021
bbba0e8
Fixing test
droberts195 Nov 25, 2021
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
2 changes: 1 addition & 1 deletion ...src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/AnomalyJobCRUDIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public void testOpenJobWithOldSnapshot() {
assertThat(
ex.getMessage(),
containsString(
"[open-job-with-old-model-snapshot] job snapshot [snap_1] has min version before [7.0.0], "
"[open-job-with-old-model-snapshot] job model snapshot [snap_1] has min version before [7.0.0], "
+ "please revert to a newer model snapshot or reset the job"
)
);
Expand Down
9 changes: 5 additions & 4 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 @@ -54,7 +54,8 @@
import java.util.function.Predicate;

import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN;
import static org.elasticsearch.xpack.ml.job.task.OpenJobPersistentTasksExecutor.MIN_SUPPORTED_SNAPSHOT_VERSION;
import static org.elasticsearch.xpack.ml.job.task.OpenJobPersistentTasksExecutor.MIN_CHECKED_SUPPORTED_SNAPSHOT_VERSION;
import static org.elasticsearch.xpack.ml.job.task.OpenJobPersistentTasksExecutor.MIN_REPORTED_SUPPORTED_SNAPSHOT_VERSION;
import static org.elasticsearch.xpack.ml.job.task.OpenJobPersistentTasksExecutor.checkAssignmentState;

/*
Expand Down Expand Up @@ -191,17 +192,17 @@ public void onFailure(Exception e) {
return;
}
assert modelSnapshot.getPage().results().size() == 1;
if (modelSnapshot.getPage().results().get(0).getMinVersion().onOrAfter(MIN_SUPPORTED_SNAPSHOT_VERSION)) {
if (modelSnapshot.getPage().results().get(0).getMinVersion().onOrAfter(MIN_CHECKED_SUPPORTED_SNAPSHOT_VERSION)) {
modelSnapshotValidationListener.onResponse(true);
return;
}
listener.onFailure(
ExceptionsHelper.badRequestException(
"[{}] job snapshot [{}] has min version before [{}], "
"[{}] job model snapshot [{}] has min version before [{}], "
+ "please revert to a newer model snapshot or reset the job",
jobParams.getJobId(),
jobParams.getJob().getModelSnapshotId(),
MIN_SUPPORTED_SNAPSHOT_VERSION.toString()
MIN_REPORTED_SUPPORTED_SNAPSHOT_VERSION.toString()
)
);
}, failure -> {
Expand Down
14 changes: 10 additions & 4 deletions .../ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@
public class OpenJobPersistentTasksExecutor extends AbstractJobPersistentTasksExecutor<OpenJobAction.JobParams> {

private static final Logger logger = LogManager.getLogger(OpenJobPersistentTasksExecutor.class);
public static final Version MIN_SUPPORTED_SNAPSHOT_VERSION = Version.V_7_0_0;
// Ideally this would be 7.0.0, but it has to be 6.4.0 because due to an oversight it's impossible
// for the Java code to distinguish the model states for versions 6.4.0 to 7.9.3 inclusive.
public static final Version MIN_CHECKED_SUPPORTED_SNAPSHOT_VERSION = Version.fromString("6.4.0");
// We tell the user we support model snapshots newer than 7.0.0 as that's the major version
// boundary, even though behind the scenes we have to support back to 6.4.0.
public static final Version MIN_REPORTED_SUPPORTED_SNAPSHOT_VERSION = Version.V_7_0_0;

// Resuming a job with a running datafeed from its current snapshot was added in 7.11 and
// can only be done if the master node is on or after that version.
Expand Down Expand Up @@ -425,16 +430,17 @@ private void verifyCurrentSnapshotVersion(String jobId, ActionListener<Boolean>
}
assert snapshot.getPage().results().size() == 1;
ModelSnapshot snapshotObj = snapshot.getPage().results().get(0);
if (snapshotObj.getMinVersion().onOrAfter(MIN_SUPPORTED_SNAPSHOT_VERSION)) {
if (snapshotObj.getMinVersion().onOrAfter(MIN_CHECKED_SUPPORTED_SNAPSHOT_VERSION)) {
listener.onResponse(true);
return;
}
listener.onFailure(
ExceptionsHelper.badRequestException(
"[{}] job snapshot [{}] has min version before [{}], please revert to a newer model snapshot or reset the job",
"[{}] job model snapshot [{}] has min version before [{}], "
+ "please revert to a newer model snapshot or reset the job",
jobId,
jobSnapshotId,
MIN_SUPPORTED_SNAPSHOT_VERSION.toString()
MIN_REPORTED_SUPPORTED_SNAPSHOT_VERSION.toString()
)
);
}, snapshotFailure -> {
Expand Down