Skip to content

HDDS-17511. Fix healthy datanode counts in admin checks #11809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
F64116045 wants to merge 1 commit into
base: master
Choose a base branch
from
+69 −8
Open

HDDS-17511. Fix healthy datanode counts in admin checks #11809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...dds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,20 +379,20 @@ public synchronized void startDecommission(DatanodeDetails dn)
}

private synchronized boolean checkIfDecommissionPossible(List<DatanodeDetails> dns, List<DatanodeAdminError> errors) {
int numDecom = dns.size();
int healthyNodesToDecommission = 0;
List<DatanodeDetails> validDns = new ArrayList<>(dns);
int inServiceTotal = nodeManager.getNodeCount(NodeStatus.inServiceHealthy());
for (DatanodeDetails dn : dns) {
try {
NodeStatus nodeStatus = getNodeStatus(dn);
NodeOperationalState opState = nodeStatus.getOperationalState();
if (opState != NodeOperationalState.IN_SERVICE) {
numDecom--;
validDns.remove(dn);
LOG.warn("Cannot decommission {} because it is not IN-SERVICE", dn.getHostName());
} else if (nodeStatus.isHealthy()) {
healthyNodesToDecommission++;
}
} catch (NodeNotFoundException ex) {
numDecom--;
validDns.remove(dn);
LOG.warn("Cannot decommission {} because it is not found in SCM", dn.getHostName());
}
Expand Down Expand Up @@ -422,7 +422,7 @@ private synchronized boolean checkIfDecommissionPossible(List<DatanodeDetails> d
continue;
}
int reqNodes = cif.getReplicationConfig().getRequiredNodes();
if ((inServiceTotal - numDecom) < reqNodes) {
if ((inServiceTotal - healthyNodesToDecommission) < reqNodes) {
final int unHealthyTotal = nodeManager.getAllNodeCount() - inServiceTotal;
String errorMsg = "Insufficient nodes. Tried to decommission " + dns.size() +
" nodes out of " + inServiceTotal + " IN-SERVICE HEALTHY and " + unHealthyTotal +
Expand Down Expand Up @@ -536,20 +536,20 @@ public synchronized void startMaintenance(DatanodeDetails dn, int endInHours)
}

private synchronized boolean checkIfMaintenancePossible(List<DatanodeDetails> dns, List<DatanodeAdminError> errors) {
int numMaintenance = dns.size();
int healthyNodesEnteringMaintenance = 0;
List<DatanodeDetails> validDns = new ArrayList<>(dns);
int inServiceTotal = nodeManager.getNodeCount(NodeStatus.inServiceHealthy());
for (DatanodeDetails dn : dns) {
try {
NodeStatus nodeStatus = getNodeStatus(dn);
NodeOperationalState opState = nodeStatus.getOperationalState();
if (opState != NodeOperationalState.IN_SERVICE) {
numMaintenance--;
validDns.remove(dn);
LOG.warn("{} cannot enter maintenance because it is not IN-SERVICE", dn.getHostName());
} else if (nodeStatus.isHealthy()) {
healthyNodesEnteringMaintenance++;
}
} catch (NodeNotFoundException ex) {
numMaintenance--;
validDns.remove(dn);
LOG.warn("{} cannot enter maintenance because it is not found in SCM", dn.getHostName());
}
Expand Down Expand Up @@ -589,7 +589,7 @@ private synchronized boolean checkIfMaintenancePossible(List<DatanodeDetails> dn
} else {
minInService = maintenanceReplicaMinimum;
}
if ((inServiceTotal - numMaintenance) < minInService) {
if ((inServiceTotal - healthyNodesEnteringMaintenance) < minInService) {
final int unHealthyTotal = nodeManager.getAllNodeCount() - inServiceTotal;
String errorMsg = "Insufficient nodes. Tried to start maintenance for " + dns.size() +
" nodes out of " + inServiceTotal + " IN-SERVICE HEALTHY and " + unHealthyTotal +
Expand Down
61 changes: 61 additions & 0 deletions ...server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
Expand All @@ -48,6 +49,7 @@
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.DatanodeAdminError;
import org.apache.hadoop.hdds.scm.HddsTestUtils;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
import org.apache.hadoop.hdds.scm.container.ContainerManager;
Expand All @@ -60,6 +62,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.mockito.Mockito;

/**
Expand All @@ -77,6 +81,7 @@ public class TestNodeDecommissionManager {
void setup(@TempDir File dir) throws Exception {
conf = new OzoneConfiguration();
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.getAbsolutePath());
conf.setTimeDuration(ScmConfigKeys.OZONE_SCM_DATANODE_ADMIN_MONITOR_INTERVAL, 1, TimeUnit.HOURS);
StorageContainerManager scm = HddsTestUtils.getScm(conf);
nodeManager = (SCMNodeManager) scm.getScmNodeManager();
containerManager = mock(ContainerManager.class);
Expand Down Expand Up @@ -1028,6 +1033,62 @@ public void testInsufficientNodeMaintenanceChecksForNNF() throws
nodeManager.getNodeStatus(dns.get(3)).getOperationalState());
}

@ParameterizedTest
@EnumSource(value = HddsProtos.NodeState.class, names = {"STALE", "DEAD"})
void testDecommissionCountsOnlyHealthyTargets(HddsProtos.NodeState health)
throws IOException, NodeNotFoundException {
// The container requires three replicas, but only two healthy datanodes are available.
DatanodeDetails target = prepareTargetWithContainer(health, 2);

List<DatanodeAdminError> errors = decom.decommissionNodes(singletonList(target.getIpAddress()), false);
assertThat(errors).singleElement().extracting(DatanodeAdminError::getHostname).isEqualTo("AllHosts");
assertThat(nodeManager.getNodeStatus(target).getOperationalState())
.isEqualTo(HddsProtos.NodeOperationalState.IN_SERVICE);

nodeManager.register(MockDatanodeDetails.randomDatanodeDetails(), null, null);

assertThat(decom.decommissionNodes(singletonList(target.getIpAddress()), false)).isEmpty();
assertThat(nodeManager.getNodeStatus(target).getOperationalState())
.isEqualTo(HddsProtos.NodeOperationalState.DECOMMISSIONING);
}

@ParameterizedTest
@EnumSource(value = HddsProtos.NodeState.class, names = {"STALE", "DEAD"})
void testMaintenanceCountsOnlyHealthyTargets(HddsProtos.NodeState health)
throws IOException, NodeNotFoundException {
int minimumHealthyNodes = decom.getMaintenanceReplicaMinimum();
DatanodeDetails target = prepareTargetWithContainer(health, minimumHealthyNodes - 1);

List<DatanodeAdminError> errors = decom.startMaintenanceNodes(singletonList(target.getIpAddress()), 1, false);
assertThat(errors).singleElement().extracting(DatanodeAdminError::getHostname).isEqualTo("AllHosts");
assertThat(nodeManager.getNodeStatus(target).getOperationalState())
.isEqualTo(HddsProtos.NodeOperationalState.IN_SERVICE);

nodeManager.register(MockDatanodeDetails.randomDatanodeDetails(), null, null);

assertThat(decom.startMaintenanceNodes(singletonList(target.getIpAddress()), 1, false)).isEmpty();
assertThat(nodeManager.getNodeStatus(target).getOperationalState())
.isEqualTo(HddsProtos.NodeOperationalState.ENTERING_MAINTENANCE);
}

private DatanodeDetails prepareTargetWithContainer(HddsProtos.NodeState health, int healthyNodes)
throws IOException, NodeNotFoundException {
nodeManager.getNodeStateManager().pause();
int totalNodes = healthyNodes + 1;
for (int index = 0; index < totalNodes; index++) {
nodeManager.register(MockDatanodeDetails.randomDatanodeDetails(), null, null);
}
DatanodeDetails target = nodeManager.getAllNodes().get(0);
nodeManager.getNodeStateManager().getNode(target).setNodeStatus(
NodeStatus.valueOf(HddsProtos.NodeOperationalState.IN_SERVICE, health));
assertThat(nodeManager.getNodeCount(NodeStatus.inServiceHealthy())).isEqualTo(healthyNodes);
ContainerID containerID = ContainerID.valueOf(1);
setContainers(target, new HashSet<>(singletonList(containerID)));
when(containerManager.getContainer(containerID)).thenReturn(
getMockContainer(RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.THREE), containerID));
return target;
}

private List<DatanodeDetails> getDatanodeDetailsList(String ipaddress, List<DatanodeDetails> dns) {
List<DatanodeDetails> datanodeDetails = new ArrayList<>();
for (DatanodeDetails dn : dns) {
Expand Down