Skip to content

Fix snapshot upgrade test #136433

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 2 commits into from
Oct 13, 2025
+6 −12
Merged

Fix snapshot upgrade test #136433

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
d8ce5ff
Fix snapshot upgrade test
DonalEvans Oct 10, 2025
635b4b2
Merge branch 'main' into fix-snapshot-upgrade-with-mixed-cluster
DonalEvans Oct 13, 2025
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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,6 @@ tests:
- class: org.elasticsearch.xpack.profiling.action.GetStatusActionIT
method: testWaitsUntilResourcesAreCreated
issue: https://github.com/elastic/elasticsearch/issues/129486
- class: org.elasticsearch.upgrades.MlJobSnapshotUpgradeIT
method: testSnapshotUpgrader
issue: https://github.com/elastic/elasticsearch/issues/98560
- class: org.elasticsearch.search.query.VectorIT
method: testFilteredQueryStrategy
issue: https://github.com/elastic/elasticsearch/issues/129517
Expand Down
3 changes: 1 addition & 2 deletions ...c/main/java/org/elasticsearch/xpack/ml/action/TransportUpgradeJobModelSnapshotAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.ResourceAlreadyExistsException;
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
Expand Down Expand Up @@ -110,7 +109,7 @@ protected void masterOperation(Task task, Request request, ClusterState state, A
return;
}

if (state.getMinTransportVersion().equals(TransportVersion.current()) == false) {
if (state.nodes().isMixedVersionCluster()) {
listener.onFailure(
ExceptionsHelper.conflictStatusException(
"Cannot upgrade job [{}] snapshot [{}] while cluster upgrade is in progress.",
Expand Down
12 changes: 5 additions & 7 deletions ...k/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlJobSnapshotUpgradeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package org.elasticsearch.upgrades;

import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version;
import org.elasticsearch.client.Request;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.Response;
Expand Down Expand Up @@ -74,6 +75,10 @@ public void testSnapshotUpgrader() throws Exception {
case OLD -> createJobAndSnapshots();
case MIXED -> {
assumeTrue("We should only test if old cluster is before new cluster", isOriginalClusterCurrent() == false);
assumeTrue(
"Older versions could not always reliably determine if we were in a mixed cluster state",
Version.fromString(UPGRADE_FROM_VERSION).onOrAfter(Version.V_9_3_0)
);
ensureHealth((request -> {
request.addParameter("timeout", "70s");
request.addParameter("wait_for_nodes", "3");
Expand All @@ -97,13 +102,6 @@ public void testSnapshotUpgrader() throws Exception {

@SuppressWarnings("unchecked")
private void testSnapshotUpgradeFailsOnMixedCluster() throws Exception {
// TODO the mixed cluster assertions sometimes fail because the code that
// detects the mixed cluster relies on the transport versions being different.
// This assumption does not hold immediately after a version bump and new
// branch being cut as the new branch will have the same transport version
// See https://github.com/elastic/elasticsearch/issues/98560

assumeTrue("The mixed cluster is not always detected correctly, see https://github.com/elastic/elasticsearch/issues/98560", false);
Map<String, Object> jobs = entityAsMap(getJob(JOB_ID));

String currentSnapshot = ((List<String>) XContentMapValues.extractValue("jobs.model_snapshot_id", jobs)).get(0);
Expand Down