Rewire minimum active replicas to IdealState and remove the ResourceConfig copy

Remove only MIN_ACTIVE_REPLICAS from ResourceConfig and read the minimum from IdealState in delayed and WAGED rebalance paths, retaining the replica-count fallback. Preserve all other ResourceConfig settings.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Sanchit Jain

helix-core/src/main/java/org/apache/helix/controller/changedetector/trimmer/ResourceConfigTrimmer.java

@@ -40,6 +40,7 @@ public class ResourceConfigTrimmer extends HelixPropertyTrimmer<ResourceConfig>
    * MONITORING_DISABLED,
    * STATE_MODEL_DEF_REF,
    * REPLICAS,
+   * MIN_ACTIVE_REPLICAS,
    * EXTERNAL_VIEW_DISABLED,
    * DELAY_REBALANCE_ENABLED,
    * HELIX_ENABLED
@@ -48,7 +49,6 @@ public class ResourceConfigTrimmer extends HelixPropertyTrimmer<ResourceConfig>
       .of(FieldType.SIMPLE_FIELD, ImmutableSet
               .of(ResourceConfigProperty.NUM_PARTITIONS.name(),
                   ResourceConfigProperty.STATE_MODEL_FACTORY_NAME.name(),
-                  ResourceConfigProperty.MIN_ACTIVE_REPLICAS.name(),
                   ResourceConfigProperty.MAX_PARTITIONS_PER_INSTANCE.name(),
                   ResourceConfigProperty.INSTANCE_GROUP_TAG.name()),
           FieldType.MAP_FIELD, ImmutableSet

helix-core/src/main/java/org/apache/helix/controller/rebalancer/DelayedAutoRebalancer.java

@@ -171,9 +171,8 @@ public IdealState computeNewIdealState(String resourceName,
         || liveEnabledAssignableNodeList.size() != activeNodes.size()) {
       List<String> activeNodeList = new ArrayList<>(activeNodes);
       Collections.sort(activeNodeList);
-      int minActiveReplicas = DelayedRebalanceUtil.getMinActiveReplica(
-          ResourceConfig.mergeIdealStateWithResourceConfig(resourceConfig, currentIdealState),
-          currentIdealState, replicaCount);
+      int minActiveReplicas =
+          DelayedRebalanceUtil.getMinActiveReplica(currentIdealState, replicaCount);
 
       ZNRecord newActiveMapping =
           _rebalanceStrategy.computePartitionAssignment(allNodeList, activeNodeList, currentMapping,

helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/DelayedRebalanceUtil.java

@@ -235,25 +235,17 @@ public static Map<String, List<String>> getFinalDelayedMapping(
   /**
    * Get the minimum active replica count threshold that allows delayed rebalance.
    * Prioritize of the input params:
-   * 1. resourceConfig
-   * 2. idealState
-   * 3. replicaCount
+   * 1. idealState
+   * 2. replicaCount
    * The lower priority minimum active replica count will only be applied if the higher priority
-   * items are missing.
-   * TODO: Remove the idealState input once we have all the config information migrated to the
-   * TODO: resource config by default.
+   * item is missing.
    *
-   * @param resourceConfig the resource config
    * @param idealState     the ideal state of the resource
    * @param replicaCount   the expected active replica count.
    * @return the expected minimum active replica count that is required
    */
-  public static int getMinActiveReplica(ResourceConfig resourceConfig, IdealState idealState,
-      int replicaCount) {
-    int minActiveReplicas = resourceConfig == null ? -1 : resourceConfig.getMinActiveReplica();
-    if (minActiveReplicas < 0) {
-      minActiveReplicas = idealState.getMinActiveReplicas();
-    }
+  public static int getMinActiveReplica(IdealState idealState, int replicaCount) {
+    int minActiveReplicas = idealState.getMinActiveReplicas();
     if (minActiveReplicas < 0) {
       minActiveReplicas = replicaCount;
     }
@@ -408,9 +400,8 @@ private static List<String> findPartitionsMissingMinActiveReplica(
     IdealState currentIdealState = clusterData.getIdealState(resourceName);
     Set<String> enabledLiveInstances = clusterData.getEnabledLiveInstances();
     int numReplica = currentIdealState.getReplicaCount(enabledLiveInstances.size());
-    int minActiveReplica = DelayedRebalanceUtil.getMinActiveReplica(ResourceConfig
-        .mergeIdealStateWithResourceConfig(clusterData.getResourceConfig(resourceName),
-            currentIdealState), currentIdealState, numReplica);
+    int minActiveReplica =
+        DelayedRebalanceUtil.getMinActiveReplica(currentIdealState, numReplica);
     return resourceAssignment.getMappedPartitions()
         .parallelStream()
         .filter(partition -> {
@@ -429,9 +420,7 @@ private static int getMinActiveReplica(ResourceControllerDataProvider clusterDat
     IdealState currentIdealState = clusterData.getIdealState(resourceName);
     Set<String> enabledLiveInstances = clusterData.getEnabledLiveInstances();
     int numReplica = currentIdealState.getReplicaCount(enabledLiveInstances.size());
-    return DelayedRebalanceUtil.getMinActiveReplica(ResourceConfig
-        .mergeIdealStateWithResourceConfig(clusterData.getResourceConfig(resourceName),
-            currentIdealState), currentIdealState, numReplica);
+    return DelayedRebalanceUtil.getMinActiveReplica(currentIdealState, numReplica);
   }
 
   /**

helix-core/src/main/java/org/apache/helix/controller/rebalancer/waged/WagedRebalancer.java

@@ -898,9 +898,8 @@ protected boolean requireRebalanceOverwrite(ResourceControllerDataProvider clust
       Set<String> enabledLiveInstances = clusterData.getEnabledLiveInstances();
 
       int numReplica = currentIdealState.getReplicaCount(enabledLiveInstances.size());
-      int minActiveReplica = DelayedRebalanceUtil.getMinActiveReplica(ResourceConfig
-          .mergeIdealStateWithResourceConfig(clusterData.getResourceConfig(resourceName),
-              currentIdealState), currentIdealState, numReplica);
+      int minActiveReplica =
+          DelayedRebalanceUtil.getMinActiveReplica(currentIdealState, numReplica);
       resourceAssignment.getMappedPartitions().parallelStream().forEach(partition -> {
         int enabledLivePlacementCounter = 0;
         for (String instance : resourceAssignment.getReplicaMap(partition).keySet()) {

helix-core/src/main/java/org/apache/helix/model/ResourceConfig.java

@@ -49,7 +49,6 @@ public enum ResourceConfigProperty {
     MONITORING_DISABLED, // Resource-level config, do not create Mbean and report any status for the resource.
     NUM_PARTITIONS,
     STATE_MODEL_FACTORY_NAME,
-    MIN_ACTIVE_REPLICAS,
     MAX_PARTITIONS_PER_INSTANCE,
     INSTANCE_GROUP_TAG,
     HELIX_ENABLED,
@@ -99,20 +98,20 @@ public ResourceConfig(ZNRecord record, String id) {
 
   public ResourceConfig(String resourceId, Boolean monitorDisabled, int numPartitions,
       String stateModelFactoryName,
-      int minActiveReplica, int maxPartitionsPerInstance, String instanceGroupTag,
+      int maxPartitionsPerInstance, String instanceGroupTag,
       Boolean helixEnabled, Boolean externalViewDisabled, RebalanceConfig rebalanceConfig,
       StateTransitionTimeoutConfig stateTransitionTimeoutConfig,
       Map<String, List<String>> listFields, Map<String, Map<String, String>> mapFields,
       Boolean p2pMessageEnabled) {
     this(resourceId, monitorDisabled, numPartitions, stateModelFactoryName,
-        minActiveReplica, maxPartitionsPerInstance, instanceGroupTag, helixEnabled,
+        maxPartitionsPerInstance, instanceGroupTag, helixEnabled,
         externalViewDisabled, rebalanceConfig, stateTransitionTimeoutConfig, listFields, mapFields,
         p2pMessageEnabled, null);
   }
 
   private ResourceConfig(String resourceId, Boolean monitorDisabled, int numPartitions,
       String stateModelFactoryName,
-      int minActiveReplica, int maxPartitionsPerInstance, String instanceGroupTag,
+      int maxPartitionsPerInstance, String instanceGroupTag,
       Boolean helixEnabled, Boolean externalViewDisabled, RebalanceConfig rebalanceConfig,
       StateTransitionTimeoutConfig stateTransitionTimeoutConfig,
       Map<String, List<String>> listFields, Map<String, Map<String, String>> mapFields,
@@ -135,10 +134,6 @@ private ResourceConfig(String resourceId, Boolean monitorDisabled, int numPartit
       _record.setSimpleField(ResourceConfigProperty.STATE_MODEL_FACTORY_NAME.name(), stateModelFactoryName);
     }
 
-    if (minActiveReplica >= 0) {
-      _record.setIntField(ResourceConfigProperty.MIN_ACTIVE_REPLICAS.name(), minActiveReplica);
-    }
-
     if (maxPartitionsPerInstance >= 0) {
       _record.setIntField(ResourceConfigProperty.MAX_PARTITIONS_PER_INSTANCE.name(), maxPartitionsPerInstance);
     }
@@ -227,15 +222,6 @@ public String getStateModelFactoryName() {
     return _record.getSimpleField(ResourceConfigProperty.STATE_MODEL_FACTORY_NAME.name());
   }
 
-  /**
-   * Get the number of minimal active partitions for this resource.
-   *
-   * @return
-   */
-  public int getMinActiveReplica() {
-    return _record.getIntField(ResourceConfigProperty.MIN_ACTIVE_REPLICAS.name(), -1);
-  }
-
   // Delimiter used for storing active states as a comma-separated string in simpleField
   private static final String ACTIVE_STATES_DELIMITER = ",";
 
@@ -574,7 +560,6 @@ public static class Builder {
     private Boolean _monitorDisabled;
     private int _numPartitions;
     private String _stateModelFactoryName;
-    private int _minActiveReplica = -1;
     private int _maxPartitionsPerInstance = -1;
     private String _instanceGroupTag;
     private Boolean _helixEnabled;
@@ -632,15 +617,6 @@ public Builder setStateModelFactoryName(String stateModelFactoryName) {
       return this;
     }
 
-    public int getMinActiveReplica() {
-      return _minActiveReplica;
-    }
-
-    public Builder setMinActiveReplica(int minActiveReplica) {
-      _minActiveReplica = minActiveReplica;
-      return this;
-    }
-
     public int getMaxPartitionsPerInstance() {
       return _maxPartitionsPerInstance;
     }
@@ -789,7 +765,7 @@ public ResourceConfig build() {
       // validate();
 
       return new ResourceConfig(_resourceId, _monitorDisabled, _numPartitions,
-          _stateModelFactoryName, _minActiveReplica, _maxPartitionsPerInstance,
+          _stateModelFactoryName, _maxPartitionsPerInstance,
           _instanceGroupTag, _helixEnabled, _externalViewDisabled, _rebalanceConfig,
           _stateTransitionTimeoutConfig, _preferenceLists, _mapFields, _p2pMessageEnabled,
           _partitionCapacityMap);
@@ -837,9 +813,6 @@ public static ResourceConfig mergeIdealStateWithResourceConfig(
     mergedZNRecord.setSimpleFieldIfAbsent(
         ResourceConfig.ResourceConfigProperty.STATE_MODEL_FACTORY_NAME.name(),
         idealState.getStateModelFactoryName());
-    mergedZNRecord
-        .setIntFieldIfAbsent(ResourceConfig.ResourceConfigProperty.MIN_ACTIVE_REPLICAS.name(),
-            idealState.getMinActiveReplicas());
     mergedZNRecord
         .setBooleanFieldIfAbsent(ResourceConfig.ResourceConfigProperty.HELIX_ENABLED.name(),
             idealState.isEnabled());

helix-core/src/test/java/org/apache/helix/controller/rebalancer/waged/model/TestClusterModelProvider.java

@@ -308,7 +308,6 @@ private void prepareData(Map<String, Map<String, Map<String, String>>> input,
     Map<String, IdealState> isMap = new HashMap<>();
     for (String resource : _resourceNames) {
       ResourceConfig resourceConfig = new ResourceConfig.Builder(resource)
-          .setMinActiveReplica(minActiveReplica)
           .build();
       _resourceConfigMap.put(resource, resourceConfig);
       IdealState is = new IdealState(resource);

helix-core/src/test/java/org/apache/helix/model/TestResourceConfig.java

@@ -187,10 +187,9 @@ public void testWithResourceBuilderInvalidInput() {
   @Test
   public void testConstructorWithoutGroupRoutingFields() {
     ResourceConfig resourceConfig = new ResourceConfig("resource", false, 2, "DEFAULT",
-        1, 10, "placementTag", true, false, null, null, null, null, true);
+        10, "placementTag", true, false, null, null, null, null, true);
     Assert.assertEquals(resourceConfig.getNumPartitions(), 2);
     Assert.assertEquals(resourceConfig.getStateModelFactoryName(), "DEFAULT");
-    Assert.assertEquals(resourceConfig.getMinActiveReplica(), 1);
     Assert.assertEquals(resourceConfig.getMaxPartitionsPerInstance(), 10);
     Assert.assertEquals(resourceConfig.getInstanceGroupTag(), "placementTag");
     Assert.assertTrue(resourceConfig.isEnabled());
@@ -199,7 +198,7 @@ public void testConstructorWithoutGroupRoutingFields() {
     Assert.assertTrue(resourceConfig.isP2PMessageEnabled());
     for (String legacyField :
         new String[]{"RESOURCE_GROUP_NAME", "RESOURCE_TYPE", "GROUP_ROUTING_ENABLED",
-            "STATE_MODEL_DEF_REF", "REPLICAS"}) {
+            "STATE_MODEL_DEF_REF", "REPLICAS", "MIN_ACTIVE_REPLICAS"}) {
       Assert.assertFalse(resourceConfig.getRecord().getSimpleFields().containsKey(legacyField));
     }
   }
@@ -239,8 +238,6 @@ public void testMergeWithIdealState() {
     Assert.assertEquals(mergedResourceConfig.getNumPartitions(), testIdealState.getNumPartitions());
     Assert.assertEquals(mergedResourceConfig.getStateModelFactoryName(),
         testIdealState.getStateModelFactoryName());
-    Assert.assertEquals(mergedResourceConfig.getMinActiveReplica(),
-        testIdealState.getMinActiveReplicas());
     Assert
         .assertEquals(mergedResourceConfig.isEnabled().booleanValue(), testIdealState.isEnabled());
     for (String legacyField :
@@ -258,7 +255,6 @@ public void testMergeWithIdealState() {
     configBuilder.setMaxPartitionsPerInstance(2);
     configBuilder.setNumPartitions(2);
     configBuilder.setStateModelFactoryName("testRCFactory");
-    configBuilder.setMinActiveReplica(2);
     configBuilder.setHelixEnabled(false);
     configBuilder.setExternalViewDisabled(true);
     testConfig = configBuilder.build();
@@ -274,8 +270,6 @@ public void testMergeWithIdealState() {
     Assert.assertEquals(mergedResourceConfig.getNumPartitions(), testConfig.getNumPartitions());
     Assert.assertEquals(mergedResourceConfig.getStateModelFactoryName(),
         testConfig.getStateModelFactoryName());
-    Assert
-        .assertEquals(mergedResourceConfig.getMinActiveReplica(), testConfig.getMinActiveReplica());
     Assert.assertEquals(mergedResourceConfig.isEnabled(), testConfig.isEnabled());
     for (String legacyField :
         new String[]{"RESOURCE_GROUP_NAME", "RESOURCE_TYPE", "GROUP_ROUTING_ENABLED"}) {