Updated awareness balance condition

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

Author: vinaykpud

server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java

@@ -1505,10 +1505,7 @@ List<String> getIndexSettingsValidationErrors(
 
             Optional<String> replicaValidationError = awarenessReplicaBalance.validateReplicas(replicaCount, autoExpandReplica);
             replicaValidationError.ifPresent(validationErrors::add);
-            Optional<String> searchReplicaValidationError = awarenessReplicaBalance.validateSearchReplicas(
-                searchReplicaCount,
-                autoExpandReplica
-            );
+            Optional<String> searchReplicaValidationError = awarenessReplicaBalance.validateSearchReplicas(searchReplicaCount);
             searchReplicaValidationError.ifPresent(validationErrors::add);
         }
         return validationErrors;

server/src/main/java/org/opensearch/cluster/metadata/MetadataUpdateSettingsService.java

@@ -304,10 +304,7 @@ public ClusterState execute(ClusterState currentState) {
                             for (Index index : request.indices()) {
                                 if (index.getName().charAt(0) != '.') {
                                     // No replica count validation for system indices
-                                    Optional<String> error = awarenessReplicaBalance.validateSearchReplicas(
-                                        updatedNumberOfSearchReplicas,
-                                        AutoExpandReplicas.SETTING.get(openSettings)
-                                    );
+                                    Optional<String> error = awarenessReplicaBalance.validateSearchReplicas(updatedNumberOfSearchReplicas);
 
                                     if (error.isPresent()) {
                                         ValidationException ex = new ValidationException();

server/src/main/java/org/opensearch/cluster/routing/allocation/AwarenessReplicaBalance.java

@@ -122,16 +122,13 @@ public Optional<String> validateReplicas(int replicaCount, AutoExpandReplicas au
         return Optional.empty();
     }
 
-    public Optional<String> validateSearchReplicas(int searchReplicaCount, AutoExpandReplicas autoExpandReplica) {
-        if (autoExpandReplica.isEnabled()) {
-            // TODO: For now Search replicas do not support auto expand, when we add support update this validation
-        } else {
-            if (searchReplicaCount > 0 && searchReplicaCount % maxAwarenessAttributes() != 0) {
-                String errorMessage = "total search replicas needs to be a multiple of total awareness attributes ["
-                    + maxAwarenessAttributes()
-                    + "]";
-                return Optional.of(errorMessage);
-            }
+    public Optional<String> validateSearchReplicas(int searchReplicaCount) {
+        // TODO: For now Search replicas do not support auto expand, when we add support update this validation
+        if (searchReplicaCount > 0 && searchReplicaCount % maxAwarenessAttributes() != 0) {
+            String errorMessage = "total search replicas needs to be a multiple of total awareness attributes ["
+                + maxAwarenessAttributes()
+                + "]";
+            return Optional.of(errorMessage);
         }
         return Optional.empty();
     }

server/src/test/java/org/opensearch/cluster/routing/allocation/AwarenessReplicaBalanceTests.java

@@ -38,8 +38,8 @@ public void testNoForcedAwarenessAttribute() {
         assertEquals(awarenessReplicaBalance.validateReplicas(0, autoExpandReplica), Optional.empty());
         assertEquals(awarenessReplicaBalance.validateReplicas(1, autoExpandReplica), Optional.empty());
 
-        assertEquals(awarenessReplicaBalance.validateSearchReplicas(0, autoExpandReplica), Optional.empty());
-        assertEquals(awarenessReplicaBalance.validateSearchReplicas(1, autoExpandReplica), Optional.empty());
+        assertEquals(awarenessReplicaBalance.validateSearchReplicas(0), Optional.empty());
+        assertEquals(awarenessReplicaBalance.validateSearchReplicas(1), Optional.empty());
     }
 
     public void testForcedAwarenessAttribute() {
@@ -76,11 +76,6 @@ public void testForcedAwarenessAttribute() {
         assertEquals(awarenessReplicaBalance.validateReplicas(1, autoExpandReplica), Optional.empty());
         assertEquals(awarenessReplicaBalance.validateReplicas(0, autoExpandReplica), Optional.empty());
 
-        assertEquals(awarenessReplicaBalance.validateSearchReplicas(3, autoExpandReplica), Optional.empty());
-        assertEquals(awarenessReplicaBalance.validateSearchReplicas(2, autoExpandReplica), Optional.empty());
-        assertEquals(awarenessReplicaBalance.validateSearchReplicas(1, autoExpandReplica), Optional.empty());
-        assertEquals(awarenessReplicaBalance.validateSearchReplicas(0, autoExpandReplica), Optional.empty());
-
         // when auto expand is not valid set as per zone awareness
         settings = Settings.builder()
             .put(AwarenessAllocationDecider.CLUSTER_ROUTING_ALLOCATION_AWARENESS_ATTRIBUTE_SETTING.getKey(), "zone, rack")
@@ -123,14 +118,14 @@ public void testForcedAwarenessAttribute() {
             Optional.of("expected total copies needs to be a multiple of total awareness attributes [3]")
         );
 
-        assertEquals(awarenessReplicaBalance.validateSearchReplicas(3, autoExpandReplica), Optional.empty());
-        assertEquals(awarenessReplicaBalance.validateSearchReplicas(0, autoExpandReplica), Optional.empty());
+        assertEquals(awarenessReplicaBalance.validateSearchReplicas(3), Optional.empty());
+        assertEquals(awarenessReplicaBalance.validateSearchReplicas(0), Optional.empty());
         assertEquals(
-            awarenessReplicaBalance.validateSearchReplicas(2, autoExpandReplica),
+            awarenessReplicaBalance.validateSearchReplicas(2),
             Optional.of("total search replicas needs to be a multiple of total awareness attributes [3]")
         );
         assertEquals(
-            awarenessReplicaBalance.validateSearchReplicas(1, autoExpandReplica),
+            awarenessReplicaBalance.validateSearchReplicas(1),
             Optional.of("total search replicas needs to be a multiple of total awareness attributes [3]")
         );
     }