This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 eca52b422bd HDDS-14614. Improve handling for
REPLICATION_NOT_HEALTHY_BEFORE_MOVE in Container Balancer (#9818)
eca52b422bd is described below
commit eca52b422bde21f5f3448f732c377aaa2b4422fb
Author: Siddhant Sangwan <[email protected]>
AuthorDate: Thu Feb 26 15:05:02 2026 +0530
HDDS-14614. Improve handling for REPLICATION_NOT_HEALTHY_BEFORE_MOVE in
Container Balancer (#9818)
---
.../ContainerBalancerSelectionCriteria.java | 57 ++++++---
.../container/balancer/ContainerBalancerTask.java | 3 +-
.../hdds/scm/container/balancer/MockedSCM.java | 7 ++
.../TestContainerBalancerSelectionCriteria.java | 138 +++++++++++++++++++++
.../balancer/TestContainerBalancerTask.java | 38 ++++++
5 files changed, 227 insertions(+), 16 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerSelectionCriteria.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerSelectionCriteria.java
index 2c2395af6ba..c74ae7dd411 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerSelectionCriteria.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerSelectionCriteria.java
@@ -33,6 +33,7 @@
import org.apache.hadoop.hdds.scm.container.ContainerManager;
import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException;
import org.apache.hadoop.hdds.scm.container.ContainerReplica;
+import org.apache.hadoop.hdds.scm.container.replication.ContainerHealthResult;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
@@ -76,7 +77,8 @@ public ContainerBalancerSelectionCriteria(
}
/**
- * Checks whether container is currently undergoing replication or deletion.
+ * Checks whether container is currently undergoing replication or deletion
by checking if there's an add or delete
+ * scheduled for it.
*
* @param containerID Container to check.
* @return true if container is replicating or deleting, otherwise false.
@@ -163,13 +165,28 @@ public boolean shouldBeExcluded(ContainerID containerID,
"candidate container. Excluding it.", containerID);
return true;
}
- return excludeContainers.contains(containerID) ||
excludeContainersDueToFailure.contains(containerID) ||
+
+ if (excludeContainers.contains(containerID) ||
+ excludeContainersDueToFailure.contains(containerID) ||
containerToSourceMap.containsKey(containerID) ||
- !isContainerClosed(container, node) ||
- isContainerReplicatingOrDeleting(containerID) ||
!findSourceStrategy.canSizeLeaveSource(node, container.getUsedBytes())
|| breaksMaxSizeToMoveLimit(container.containerID(),
- container.getUsedBytes(), sizeMovedAlready);
+ container.getUsedBytes(), sizeMovedAlready)) {
+ return true;
+ }
+
+ Set<ContainerReplica> replicas;
+ try {
+ replicas =
containerManager.getContainerReplicas(container.containerID());
+ } catch (ContainerNotFoundException e) {
+ LOG.warn("Container {} does not exist in ContainerManager. Skipping " +
+ "this container.", container.getContainerID(), e);
+ return true;
+ }
+
+ return !isContainerClosed(container, node, replicas) ||
+ !isContainerHealthyForMove(container, replicas) ||
+ isContainerReplicatingOrDeleting(containerID);
}
/**
@@ -184,20 +201,12 @@ public boolean shouldBeExcluded(ContainerID containerID,
* specified datanode is CLOSED, else false
*/
private boolean isContainerClosed(ContainerInfo container,
- DatanodeDetails datanodeDetails) {
+ DatanodeDetails datanodeDetails,
+ Set<ContainerReplica> replicas) {
if (!container.getState().equals(HddsProtos.LifeCycleState.CLOSED)) {
return false;
}
- // also check that the replica on the specified DN is closed
- Set<ContainerReplica> replicas;
- try {
- replicas =
containerManager.getContainerReplicas(container.containerID());
- } catch (ContainerNotFoundException e) {
- LOG.warn("Container {} does not exist in ContainerManager. Skipping " +
- "this container.", container.getContainerID(), e);
- return false;
- }
for (ContainerReplica replica : replicas) {
if (replica.getDatanodeDetails().equals(datanodeDetails)) {
// don't consider replica if it's not closed
@@ -209,6 +218,24 @@ private boolean isContainerClosed(ContainerInfo container,
return false;
}
+ /**
+ * This asks replication manager whether a container is under/over/mis
replicated. The intention is the same as
+ * isContainerReplicatingOrDeleting but the check is done in a different way
to be doubly sure.
+ * @param container container to check
+ * @param replicas the container's replicas
+ * @return false if it should not be moved, true otherwise
+ */
+ private boolean isContainerHealthyForMove(ContainerInfo container,
Set<ContainerReplica> replicas) {
+ ContainerHealthResult.HealthState state =
+ replicationManager.getContainerReplicationHealth(container,
replicas).getHealthState();
+ if (state != ContainerHealthResult.HealthState.HEALTHY) {
+ LOG.debug("Excluding container {} with replicas {} as its health is
{}.", container, replicas, state);
+ return false;
+ }
+
+ return true;
+ }
+
private boolean breaksMaxSizeToMoveLimit(ContainerID containerID,
long usedBytes,
long sizeMovedAlready) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerTask.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerTask.java
index 59c010e091c..3726269edc8 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerTask.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerTask.java
@@ -996,7 +996,8 @@ private boolean moveContainer(DatanodeDetails source,
result == MoveManager.MoveResult.REPLICATION_FAIL_EXIST_IN_TARGET
||
result ==
MoveManager.MoveResult.REPLICATION_FAIL_CONTAINER_NOT_CLOSED ||
result ==
MoveManager.MoveResult.REPLICATION_FAIL_INFLIGHT_DELETION ||
- result ==
MoveManager.MoveResult.REPLICATION_FAIL_INFLIGHT_REPLICATION) {
+ result ==
MoveManager.MoveResult.REPLICATION_FAIL_INFLIGHT_REPLICATION ||
+ result ==
MoveManager.MoveResult.REPLICATION_NOT_HEALTHY_BEFORE_MOVE) {
// add source back to queue as a different container can be selected
in next run.
// the container which caused failure of move is not excluded
// as it is an intermittent failure or a replica related failure
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockedSCM.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockedSCM.java
index f39b3f00ff3..3c6afc11a58 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockedSCM.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockedSCM.java
@@ -36,12 +36,14 @@
import org.apache.hadoop.hdds.scm.PlacementPolicy;
import org.apache.hadoop.hdds.scm.PlacementPolicyValidateProxy;
import org.apache.hadoop.hdds.scm.container.ContainerID;
+import org.apache.hadoop.hdds.scm.container.ContainerInfo;
import org.apache.hadoop.hdds.scm.container.ContainerManager;
import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException;
import org.apache.hadoop.hdds.scm.container.ContainerReplicaNotFoundException;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
import
org.apache.hadoop.hdds.scm.container.placement.algorithms.ContainerPlacementPolicyFactory;
import
org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementMetrics;
+import org.apache.hadoop.hdds.scm.container.replication.ContainerHealthResult;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
import org.apache.hadoop.hdds.scm.exceptions.SCMException;
import org.apache.hadoop.hdds.scm.ha.SCMContext;
@@ -266,6 +268,11 @@ private MockedReplicationManager() {
.when(mockedManager.manager.isContainerReplicatingOrDeleting(Mockito.any(ContainerID.class)))
.thenReturn(false);
+ Mockito.when(mockedManager.manager.getContainerReplicationHealth(
+ Mockito.any(ContainerInfo.class),
Mockito.anySet())).thenAnswer(invocationOnMock ->
+ new ContainerHealthResult.HealthyResult(
+ invocationOnMock.getArgument(0, ContainerInfo.class)));
+
Mockito
.when(mockedManager.manager.getClock())
.thenReturn(Clock.system(ZoneId.systemDefault()));
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerSelectionCriteria.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerSelectionCriteria.java
new file mode 100644
index 00000000000..60e74eb183c
--- /dev/null
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerSelectionCriteria.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdds.scm.container.balancer;
+
+import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState.IN_SERVICE;
+import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.THREE;
+import static
org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto.State.CLOSED;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.hadoop.hdds.client.RatisReplicationConfig;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.protocol.MockDatanodeDetails;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.scm.container.ContainerID;
+import org.apache.hadoop.hdds.scm.container.ContainerInfo;
+import org.apache.hadoop.hdds.scm.container.ContainerManager;
+import org.apache.hadoop.hdds.scm.container.ContainerReplica;
+import org.apache.hadoop.hdds.scm.container.replication.ContainerHealthResult;
+import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
+import org.apache.hadoop.hdds.scm.container.replication.ReplicationTestUtil;
+import org.apache.hadoop.hdds.scm.node.NodeManager;
+import org.apache.hadoop.ozone.OzoneConsts;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ContainerBalancerSelectionCriteria}.
+ */
+public class TestContainerBalancerSelectionCriteria {
+
+ private ContainerBalancerSelectionCriteria criteria;
+ private ContainerManager containerManager;
+ private ReplicationManager replicationManager;
+ private DatanodeDetails source;
+ private ContainerInfo containerInfo;
+ private ContainerID containerID;
+
+ @BeforeEach
+ public void setup() throws Exception {
+ OzoneConfiguration conf = new OzoneConfiguration();
+ ContainerBalancerConfiguration balancerConfiguration =
conf.getObject(ContainerBalancerConfiguration.class);
+ balancerConfiguration.setMaxSizeToMovePerIteration(100 * OzoneConsts.GB);
+
+ NodeManager nodeManager = mock(NodeManager.class);
+ containerManager = mock(ContainerManager.class);
+ replicationManager = mock(ReplicationManager.class);
+ FindSourceStrategy findSourceStrategy = mock(FindSourceStrategy.class);
+
+ source = MockDatanodeDetails.randomDatanodeDetails();
+ containerInfo =
ReplicationTestUtil.createContainerInfo(RatisReplicationConfig.getInstance(THREE),
1L,
+ HddsProtos.LifeCycleState.CLOSED, 1L, OzoneConsts.GB);
+ containerID = containerInfo.containerID();
+
+ Set<ContainerReplica> replicas = new HashSet<>();
+ replicas.add(ReplicationTestUtil.createContainerReplica(containerID, 0,
IN_SERVICE, CLOSED,
+ 1L, OzoneConsts.GB, source, source.getID()));
+
+ when(containerManager.getContainer(containerID)).thenReturn(containerInfo);
+
when(containerManager.getContainerReplicas(containerID)).thenReturn(replicas);
+
when(replicationManager.isContainerReplicatingOrDeleting(containerID)).thenReturn(false);
+ when(replicationManager.getContainerReplicationHealth(eq(containerInfo),
anySet()))
+ .thenReturn(new ContainerHealthResult.HealthyResult(containerInfo));
+ when(findSourceStrategy.canSizeLeaveSource(any(DatanodeDetails.class),
anyLong())).thenReturn(true);
+
+ criteria = new ContainerBalancerSelectionCriteria(balancerConfiguration,
nodeManager, replicationManager,
+ containerManager, findSourceStrategy, new HashMap<>());
+ }
+
+ @Test
+ public void shouldExcludeUnderReplicatedContainer() {
+ when(replicationManager.getContainerReplicationHealth(eq(containerInfo),
anySet())).thenReturn(
+ new ContainerHealthResult.UnderReplicatedHealthResult(containerInfo, 1,
+ false, false, false));
+
+ assertTrue(criteria.shouldBeExcluded(containerID, source, 0L));
+ }
+
+ @Test
+ public void shouldExcludeOverReplicatedContainer() {
+ when(replicationManager.getContainerReplicationHealth(eq(containerInfo),
anySet())).thenReturn(
+ new ContainerHealthResult.OverReplicatedHealthResult(containerInfo, 1,
false));
+
+ assertTrue(criteria.shouldBeExcluded(containerID, source, 0L));
+ }
+
+ @Test
+ public void shouldExcludeMisReplicatedContainer() {
+ when(replicationManager.getContainerReplicationHealth(eq(containerInfo),
anySet())).thenReturn(
+ new ContainerHealthResult.MisReplicatedHealthResult(containerInfo,
false, "test"));
+
+ assertTrue(criteria.shouldBeExcluded(containerID, source, 0L));
+ }
+
+ @Test
+ public void shouldNotExcludeHealthyContainer() {
+ assertFalse(criteria.shouldBeExcluded(containerID, source, 0L));
+ }
+
+ @Test
+ public void shouldExcludeReplicatingContainer()
+ throws Exception {
+
when(replicationManager.isContainerReplicatingOrDeleting(containerID)).thenReturn(true);
+
+ assertTrue(criteria.shouldBeExcluded(containerID, source, 0L));
+
+ verify(containerManager, times(1)).getContainerReplicas(containerID);
+ verify(replicationManager, times(1)).getContainerReplicationHealth(
+ eq(containerInfo), anySet());
+ }
+}
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java
index 8205f1c7206..dec7fa0e991 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java
@@ -22,6 +22,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doAnswer;
@@ -61,6 +62,7 @@
import
org.apache.hadoop.hdds.scm.container.placement.algorithms.ContainerPlacementPolicyFactory;
import
org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementMetrics;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
+import org.apache.hadoop.hdds.scm.container.replication.ContainerHealthResult;
import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager;
import org.apache.hadoop.hdds.scm.ha.SCMContext;
import org.apache.hadoop.hdds.scm.ha.SCMService;
@@ -159,6 +161,8 @@ public void setup(TestInfo testInfo) throws IOException,
NodeNotFoundException,
when(replicationManager
.isContainerReplicatingOrDeleting(any(ContainerID.class)))
.thenReturn(false);
+
when(replicationManager.getContainerReplicationHealth(any(ContainerInfo.class),
anySet()))
+ .thenAnswer(invocationOnMock -> new
ContainerHealthResult.HealthyResult(invocationOnMock.getArgument(0)));
when(replicationManager.getClock())
.thenReturn(Clock.system(ZoneId.systemDefault()));
@@ -383,6 +387,40 @@ public void testSourceDatanodeAddedBack()
stopBalancer();
}
+ /**
+ * Tests if balancer adds a source DN back when move fails with
+ * REPLICATION_NOT_HEALTHY_BEFORE_MOVE so another container can be tried.
+ */
+ @Test
+ public void testSourceDatanodeAddedBackForReplicationNotHealthyBeforeMove()
+ throws Exception {
+ when(moveManager.move(any(ContainerID.class), any(DatanodeDetails.class),
any(DatanodeDetails.class)))
+
.thenReturn(CompletableFuture.completedFuture(MoveManager.MoveResult.REPLICATION_NOT_HEALTHY_BEFORE_MOVE))
+
.thenReturn(CompletableFuture.completedFuture(MoveManager.MoveResult.COMPLETED));
+
+ balancerConfiguration.setThreshold(10);
+ balancerConfiguration.setIterations(1);
+ balancerConfiguration.setMaxSizeEnteringTarget(10 * STORAGE_UNIT);
+ balancerConfiguration.setMaxSizeToMovePerIteration(100 * STORAGE_UNIT);
+ balancerConfiguration.setMaxDatanodesPercentageToInvolvePerIteration(100);
+ String includeNodes =
nodesInCluster.get(0).getDatanodeDetails().getHostName() + "," +
+ nodesInCluster.get(nodesInCluster.size() -
1).getDatanodeDetails().getHostName();
+ balancerConfiguration.setIncludeNodes(includeNodes);
+
+ startBalancer(balancerConfiguration);
+ GenericTestUtils.waitFor(() ->
ContainerBalancerTask.IterationResult.ITERATION_COMPLETED ==
+ containerBalancerTask.getIterationResult(), 10, 50);
+
+ assertEquals(2,
containerBalancerTask.getCountDatanodesInvolvedPerIteration());
+
assertTrue(containerBalancerTask.getMetrics().getNumContainerMovesCompletedInLatestIteration()
>= 1);
+
assertThat(containerBalancerTask.getMetrics().getNumContainerMovesFailed()).isEqualTo(1);
+
assertTrue(containerBalancerTask.getSelectedTargets().contains(nodesInCluster.get(0)
+ .getDatanodeDetails()));
+ assertTrue(containerBalancerTask.getSelectedSources().contains(
+ nodesInCluster.get(nodesInCluster.size() - 1).getDatanodeDetails()));
+ stopBalancer();
+ }
+
/**
* Test to check if balancer picks up only positive size
* containers to move from source to destination.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
