HDDS-1855. TestStorageContainerManager#testScmProcessDatanodeHeartbeat is failing. (#1153)

This commit is contained in:
Nanda kumar 2019-07-26 08:24:23 +05:30 committed by Sammi Chen
parent 6b8107ad97
commit a2cc961086

View File

@ -69,6 +69,7 @@ import org.apache.hadoop.hdds.scm.server.SCMStorageConfig;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager; import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.server.events.EventPublisher; import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.net.DNSToSwitchMapping; import org.apache.hadoop.net.DNSToSwitchMapping;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.net.StaticMapping; import org.apache.hadoop.net.StaticMapping;
import org.apache.hadoop.ozone.container.ContainerTestHelper; import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
@ -500,7 +501,9 @@ public class TestStorageContainerManager {
String scmId = UUID.randomUUID().toString(); String scmId = UUID.randomUUID().toString();
conf.setClass(NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, conf.setClass(NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY,
StaticMapping.class, DNSToSwitchMapping.class); StaticMapping.class, DNSToSwitchMapping.class);
StaticMapping.addNodeToRack(HddsUtils.getHostName(conf), "/rack1"); StaticMapping.addNodeToRack(NetUtils.normalizeHostNames(
Collections.singleton(HddsUtils.getHostName(conf))).get(0),
"/rack1");
final int datanodeNum = 3; final int datanodeNum = 3;
MiniOzoneCluster cluster = MiniOzoneCluster.newBuilder(conf) MiniOzoneCluster cluster = MiniOzoneCluster.newBuilder(conf)
@ -520,21 +523,18 @@ public class TestStorageContainerManager {
Thread.sleep(heartbeatCheckerIntervalMs * 2); Thread.sleep(heartbeatCheckerIntervalMs * 2);
List<DatanodeDetails> allNodes = scm.getScmNodeManager().getAllNodes(); List<DatanodeDetails> allNodes = scm.getScmNodeManager().getAllNodes();
Assert.assertTrue(allNodes.size() == datanodeNum); Assert.assertEquals(datanodeNum, allNodes.size());
for (int i = 0; i < allNodes.size(); i++) { for (DatanodeDetails node : allNodes) {
DatanodeInfo datanodeInfo = (DatanodeInfo) scm.getScmNodeManager() DatanodeInfo datanodeInfo = (DatanodeInfo) scm.getScmNodeManager()
.getNodeByUuid(allNodes.get(i).getUuidString()); .getNodeByUuid(node.getUuidString());
Assert.assertTrue((datanodeInfo.getLastHeartbeatTime() - start) Assert.assertTrue((datanodeInfo.getLastHeartbeatTime() - start)
>= heartbeatCheckerIntervalMs); >= heartbeatCheckerIntervalMs);
Assert.assertTrue(datanodeInfo.getUuidString() Assert.assertEquals(datanodeInfo.getUuidString(),
.equals(datanodeInfo.getNetworkName())); datanodeInfo.getNetworkName());
Assert.assertTrue(datanodeInfo.getNetworkLocation() Assert.assertEquals("/rack1", datanodeInfo.getNetworkLocation());
.equals("/rack1"));
} }
} finally { } finally {
if (cluster != null) { cluster.shutdown();
cluster.shutdown();
}
} }
} }