Fix the compatibility issue of awareness replica validation (opensear…

…ch-project#595) (opensearch-project#596) Addresses the breaking change in the OS_2.4 AwarenessReplicaBalance.validate() opensearch-project#593 Signed-off-by: bowenlan-amzn <[email protected]> (cherry picked from commit 04fce19) Co-authored-by: bowenlan-amzn <[email protected]> Signed-off-by: Ronnak Saxena <[email protected]>
ronnaksaxena · Jul 19, 2023 · 610aeb6 · 610aeb6
1 parent d5e6bee
commit 610aeb6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...anagement/indexstatemanagement/transport/action/indexpolicy/TransportIndexPolicyAction.kt b/...anagement/indexstatemanagement/transport/action/indexpolicy/TransportIndexPolicyAction.kt
@@ -19,6 +19,7 @@ import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.HandledTransportAction
 import org.opensearch.action.support.master.AcknowledgedResponse
 import org.opensearch.client.node.NodeClient
+import org.opensearch.cluster.metadata.AutoExpandReplicas
 import org.opensearch.cluster.routing.allocation.AwarenessReplicaBalance
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.ValidationException
@@ -116,10 +117,13 @@ class TransportIndexPolicyAction @Inject constructor(
 
         @Suppress("ComplexMethod", "LongMethod", "NestedBlockDepth")
         private fun validate() {
+            // ISM doesn't support update auto expand replica setting, so initiate this as false
+            val autoExpandReplica = AutoExpandReplicas.SETTING[Settings.EMPTY]
+
             request.policy.states.forEach { state ->
                 state.actions.forEach { action ->
                     if (action is ReplicaCountAction) {
-                        val error = awarenessReplicaBalance.validate(action.numOfReplicas)
+                        val error = awarenessReplicaBalance.validate(action.numOfReplicas, autoExpandReplica)
                         if (error.isPresent) {
                             val ex = ValidationException()
                             ex.addValidationError(error.get())