Change version check for cluster manager throttling setting to 2.5 (o…

…pensearch-project#5617) Signed-off-by: Dhwanil Patel <dhwanip@amazon.com>
anshu1106 · Dec 22, 2022 · 9c03010 · 9c03010
1 parent 00e4e92
commit 9c03010
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/service/ClusterManagerTaskThrottler.java b/server/src/main/java/org/opensearch/cluster/service/ClusterManagerTaskThrottler.java
@@ -115,8 +115,8 @@ public boolean isThrottlingEnabled() {
     void validateSetting(final Settings settings) {
         Map<String, Settings> groups = settings.getAsGroups();
         if (groups.size() > 0) {
-            if (minNodeVersionSupplier.get().compareTo(Version.V_2_4_0) < 0) {
-                throw new IllegalArgumentException("All the nodes in cluster should be on version later than or equal to 2.4.0");
+            if (minNodeVersionSupplier.get().compareTo(Version.V_2_5_0) < 0) {
+                throw new IllegalArgumentException("All the nodes in cluster should be on version later than or equal to 2.5.0");
             }
         }
         for (String key : groups.keySet()) {

diff --git a/server/src/test/java/org/opensearch/cluster/service/ClusterManagerTaskThrottlerTests.java b/server/src/test/java/org/opensearch/cluster/service/ClusterManagerTaskThrottlerTests.java
@@ -83,7 +83,7 @@ public void testDefaults() {
     }
 
     public void testValidateSettingsForDifferentVersion() {
-        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_4_0);
+        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_5_0);
         DiscoveryNode dataNode = getDataNode(Version.V_2_0_0);
         setState(
             clusterService,
@@ -116,8 +116,8 @@ public void testValidateSettingsForDifferentVersion() {
     }
 
     public void testValidateSettingsForTaskWihtoutRetryOnDataNode() {
-        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_4_0);
-        DiscoveryNode dataNode = getDataNode(Version.V_2_4_0);
+        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_5_0);
+        DiscoveryNode dataNode = getDataNode(Version.V_2_5_0);
         setState(
             clusterService,
             ClusterStateCreationUtils.state(clusterManagerNode, clusterManagerNode, new DiscoveryNode[] { clusterManagerNode, dataNode })
@@ -140,8 +140,8 @@ public void testValidateSettingsForTaskWihtoutRetryOnDataNode() {
     }
 
     public void testUpdateSettingsForNullValue() {
-        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_4_0);
-        DiscoveryNode dataNode = getDataNode(Version.V_2_4_0);
+        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_5_0);
+        DiscoveryNode dataNode = getDataNode(Version.V_2_5_0);
         setState(
             clusterService,
             ClusterStateCreationUtils.state(clusterManagerNode, clusterManagerNode, new DiscoveryNode[] { clusterManagerNode, dataNode })
@@ -169,8 +169,8 @@ public void testUpdateSettingsForNullValue() {
     }
 
     public void testSettingsOnBootstrap() {
-        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_4_0);
-        DiscoveryNode dataNode = getDataNode(Version.V_2_4_0);
+        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_5_0);
+        DiscoveryNode dataNode = getDataNode(Version.V_2_5_0);
         setState(
             clusterService,
             ClusterStateCreationUtils.state(clusterManagerNode, clusterManagerNode, new DiscoveryNode[] { clusterManagerNode, dataNode })
@@ -194,8 +194,8 @@ public void testSettingsOnBootstrap() {
     }
 
     public void testValidateSettingsForUnknownTask() {
-        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_4_0);
-        DiscoveryNode dataNode = getDataNode(Version.V_2_4_0);
+        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_5_0);
+        DiscoveryNode dataNode = getDataNode(Version.V_2_5_0);
         setState(
             clusterService,
             ClusterStateCreationUtils.state(clusterManagerNode, clusterManagerNode, new DiscoveryNode[] { clusterManagerNode, dataNode })
@@ -216,8 +216,8 @@ public void testValidateSettingsForUnknownTask() {
     }
 
     public void testUpdateThrottlingLimitForBasicSanity() {
-        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_4_0);
-        DiscoveryNode dataNode = getDataNode(Version.V_2_4_0);
+        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_5_0);
+        DiscoveryNode dataNode = getDataNode(Version.V_2_5_0);
         setState(
             clusterService,
             ClusterStateCreationUtils.state(clusterManagerNode, clusterManagerNode, new DiscoveryNode[] { clusterManagerNode, dataNode })
@@ -246,8 +246,8 @@ public void testUpdateThrottlingLimitForBasicSanity() {
     }
 
     public void testValidateSettingForLimit() {
-        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_4_0);
-        DiscoveryNode dataNode = getDataNode(Version.V_2_4_0);
+        DiscoveryNode clusterManagerNode = getClusterManagerNode(Version.V_2_5_0);
+        DiscoveryNode dataNode = getDataNode(Version.V_2_5_0);
         setState(
             clusterService,
             ClusterStateCreationUtils.state(clusterManagerNode, clusterManagerNode, new DiscoveryNode[] { clusterManagerNode, dataNode })