Skip to content

Commit 53545b9

Browse files
committed
use proper mixed version check
1 parent c6fba0f commit 53545b9

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportUpgradeTransformsAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.elasticsearch.threadpool.ThreadPool;
3030
import org.elasticsearch.transport.TransportService;
3131
import org.elasticsearch.xpack.core.XPackSettings;
32-
import org.elasticsearch.xpack.core.ml.utils.TransportVersionUtils;
3332
import org.elasticsearch.xpack.core.security.SecurityContext;
3433
import org.elasticsearch.xpack.core.transform.TransformMetadata;
3534
import org.elasticsearch.xpack.core.transform.action.UpgradeTransformsAction;
@@ -107,7 +106,7 @@ protected void masterOperation(Task ignoredTask, Request request, ClusterState s
107106
}
108107

109108
// do not allow in mixed clusters
110-
if (TransportVersionUtils.isMinTransportVersionSameAsCurrent(state) == false) {
109+
if (state.nodes().isMixedVersionCluster()) {
111110
listener.onFailure(
112111
new ElasticsearchStatusException("Cannot upgrade transforms while cluster upgrade is in progress.", RestStatus.CONFLICT)
113112
);

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/TransformSurvivesUpgradeIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ private void verifyUpgradeFailsIfMixedCluster() {
239239
final Request upgradeTransformRequest = new Request("POST", getTransformEndpoint() + "_upgrade");
240240

241241
Exception ex = expectThrows(Exception.class, () -> client().performRequest(upgradeTransformRequest));
242-
assertThat(ex.getMessage(), containsString("All nodes must be the same version"));
242+
assertThat(ex.getMessage(), containsString("Cannot upgrade transforms while cluster upgrade is in progress"));
243243
}
244244

245245
private void verifyUpgrade() throws IOException {

0 commit comments

Comments
 (0)