From 486e3b3b9c89e764ae6e7bb741bf6289e463de56 Mon Sep 17 00:00:00 2001 From: peterxcli Date: Wed, 26 Feb 2025 21:18:36 +0800 Subject: [PATCH] HDDS-12418. Remove healthyReplicaCountAdapter from RatisContainerReplicaCount --- .../RatisContainerReplicaCount.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java index 5323be0c1873..7bef3e612764 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java @@ -191,17 +191,11 @@ private void countReplicas() { * Total healthy replicas = 3 = 1 matching + 2 mismatched replicas */ public int getHealthyReplicaCount() { - return healthyReplicaCount + healthyReplicaCountAdapter() - + decommissionCount + maintenanceCount; + return healthyReplicaCount + decommissionCount + maintenanceCount; } public int getUnhealthyReplicaCount() { - return unhealthyReplicaCount + getUnhealthyReplicaCountAdapter() - + unhealthyDecommissionCount + unhealthyMaintenanceCount; - } - - protected int getUnhealthyReplicaCountAdapter() { - return 0; + return unhealthyReplicaCount + unhealthyDecommissionCount + unhealthyMaintenanceCount; } public int getMisMatchedReplicaCount() { @@ -213,21 +207,13 @@ public int getMatchingReplicaCount() { } private int getAvailableReplicas() { - int available = healthyReplicaCount + healthyReplicaCountAdapter(); + int available = healthyReplicaCount; if (considerUnhealthy) { - available += unhealthyReplicaCount + getUnhealthyReplicaCountAdapter(); + available += unhealthyReplicaCount; } return available; } - /** - * The new replication manager now does not consider replicas with - * UNHEALTHY state when counting sufficient replication. - */ - protected int healthyReplicaCountAdapter() { - return 0; - } - @Override public int getDecommissionCount() { return considerUnhealthy