diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/TransportVersionUtils.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/TransportVersionUtils.java deleted file mode 100644 index c733174a433b8..0000000000000 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/TransportVersionUtils.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -package org.elasticsearch.xpack.core.ml.utils; - -import org.elasticsearch.TransportVersion; -import org.elasticsearch.cluster.ClusterState; - -public class TransportVersionUtils { - private TransportVersionUtils() {} - - public static TransportVersion getMinTransportVersion(ClusterState state) { - return state.getMinTransportVersion(); - } - - public static TransportVersion getCurrentTransportVersion() { - return TransportVersion.current(); - } - - public static boolean isMinTransportVersionSameAsCurrent(ClusterState state) { - TransportVersion minTransportVersion = getMinTransportVersion(state); - TransportVersion currentTransformVersion = TransportVersion.current(); - return minTransportVersion.compareTo(currentTransformVersion) == 0; - } - - public static boolean isMinTransportVersionOnOrAfter(ClusterState state, TransportVersion version) { - return getMinTransportVersion(state).onOrAfter(version); - } -} diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartTrainedModelDeploymentAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartTrainedModelDeploymentAction.java index 23076983986c3..bebe7b0d21a55 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartTrainedModelDeploymentAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartTrainedModelDeploymentAction.java @@ -14,6 +14,7 @@ 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.search.SearchResponse; import org.elasticsearch.action.support.ActionFilters; @@ -64,7 +65,6 @@ import org.elasticsearch.xpack.core.ml.inference.trainedmodel.IndexLocation; import org.elasticsearch.xpack.core.ml.job.messages.Messages; import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; -import org.elasticsearch.xpack.core.ml.utils.TransportVersionUtils; import org.elasticsearch.xpack.ml.MachineLearning; import org.elasticsearch.xpack.ml.inference.assignment.TrainedModelAssignmentService; import org.elasticsearch.xpack.ml.inference.persistence.TrainedModelDefinitionDoc; @@ -148,7 +148,7 @@ protected void masterOperation( return; } - if (TransportVersionUtils.isMinTransportVersionSameAsCurrent(state) == false) { + if (state.getMinTransportVersion().equals(TransportVersion.current()) == false) { listener.onFailure( new ElasticsearchStatusException( "Cannot start model deployment [{}] while cluster upgrade is in progress.", diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpgradeJobModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpgradeJobModelSnapshotAction.java index c2a5c0fd17db5..f613e7ee8b3e5 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpgradeJobModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpgradeJobModelSnapshotAction.java @@ -11,6 +11,7 @@ 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; @@ -47,7 +48,6 @@ import org.elasticsearch.xpack.core.ml.job.results.Result; import org.elasticsearch.xpack.core.ml.job.snapshot.upgrade.SnapshotUpgradeTaskParams; import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; -import org.elasticsearch.xpack.core.ml.utils.TransportVersionUtils; import org.elasticsearch.xpack.ml.MachineLearning; import org.elasticsearch.xpack.ml.job.persistence.JobConfigProvider; import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider; @@ -110,7 +110,7 @@ protected void masterOperation(Task task, Request request, ClusterState state, A return; } - if (TransportVersionUtils.isMinTransportVersionSameAsCurrent(state) == false) { + if (state.getMinTransportVersion().equals(TransportVersion.current()) == false) { listener.onFailure( ExceptionsHelper.conflictStatusException( "Cannot upgrade job [{}] snapshot [{}] while cluster upgrade is in progress.", diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/utils/TransportVersionUtilsTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/utils/TransportVersionUtilsTests.java deleted file mode 100644 index 1ac18a8413cc3..0000000000000 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/utils/TransportVersionUtilsTests.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ -package org.elasticsearch.xpack.ml.utils; - -import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; -import org.elasticsearch.cluster.ClusterName; -import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.cluster.version.CompatibilityVersions; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.xpack.core.ml.utils.TransportVersionUtils; - -import java.util.Map; - -import static org.hamcrest.Matchers.equalTo; - -public class TransportVersionUtilsTests extends ESTestCase { - - private static final Map transportVersions = Map.of( - "Alfredo", - new CompatibilityVersions(TransportVersions.V_8_1_0, Map.of()), - "Bertram", - new CompatibilityVersions(TransportVersions.V_8_6_0, Map.of()), - "Charles", - new CompatibilityVersions(TransportVersions.V_8_9_X, Map.of()), - "Dominic", - new CompatibilityVersions(TransportVersions.V_8_0_0, Map.of()) - ); - - private static final ClusterState state = ClusterState.builder(new ClusterName("fred")) - .stateUUID("EC7C0637-1644-43AB-AEAB-D8B7970CAECA") - .nodeIdsToCompatibilityVersions(transportVersions) - .build(); - - public void testGetMinTransportVersion() { - assertThat(TransportVersionUtils.getMinTransportVersion(state), equalTo(TransportVersions.V_8_0_0)); - } - - public void testIsMinTransformVersionSameAsCurrent() { - assertThat(TransportVersionUtils.isMinTransportVersionSameAsCurrent(state), equalTo(false)); - - Map transportVersions1 = Map.of( - "Eugene", - new CompatibilityVersions(TransportVersion.current(), Map.of()) - ); - - ClusterState state1 = ClusterState.builder(new ClusterName("harry")) - .stateUUID("20F833F2-7C48-4522-BA78-6821C9DCD5D8") - .nodeIdsToCompatibilityVersions(transportVersions1) - .build(); - - assertThat(TransportVersionUtils.isMinTransportVersionSameAsCurrent(state1), equalTo(true)); - } - - public void testIsMinTransportVersionOnOrAfter() { - assertThat(TransportVersionUtils.isMinTransportVersionOnOrAfter(state, TransportVersions.V_8_0_0), equalTo(true)); - assertThat(TransportVersionUtils.isMinTransportVersionOnOrAfter(state, TransportVersions.V_8_9_X), equalTo(false)); - } -} diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportUpgradeTransformsAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportUpgradeTransformsAction.java index b91cf6d3bb5b6..4e7e1d324be14 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportUpgradeTransformsAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportUpgradeTransformsAction.java @@ -11,6 +11,7 @@ import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchStatusException; 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; @@ -29,7 +30,6 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.core.XPackSettings; -import org.elasticsearch.xpack.core.ml.utils.TransportVersionUtils; import org.elasticsearch.xpack.core.security.SecurityContext; import org.elasticsearch.xpack.core.transform.TransformMetadata; import org.elasticsearch.xpack.core.transform.action.UpgradeTransformsAction; @@ -107,7 +107,7 @@ protected void masterOperation(Task ignoredTask, Request request, ClusterState s } // do not allow in mixed clusters - if (TransportVersionUtils.isMinTransportVersionSameAsCurrent(state) == false) { + if (state.getMinTransportVersion().equals(TransportVersion.current()) == false) { listener.onFailure( new ElasticsearchStatusException("Cannot upgrade transforms while cluster upgrade is in progress.", RestStatus.CONFLICT) );