This is an automated email from the ASF dual-hosted git repository.
ivandika pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 59aaa5cdb0 HDDS-12418. Remove healthyReplicaCountAdapter from
RatisContainerReplicaCount (#7972)
59aaa5cdb0 is described below
commit 59aaa5cdb078f52c880fbed945f3aa8afbabe9d1
Author: Peter Lee <[email protected]>
AuthorDate: Wed Feb 26 23:04:40 2025 +0800
HDDS-12418. Remove healthyReplicaCountAdapter from
RatisContainerReplicaCount (#7972)
---
.../replication/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 5323be0c18..7bef3e6127 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
