You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2019/10/04 12:14:03 UTC
[hadoop] branch trunk updated: HDDS-2199. In SCMNodeManager
dnsToUuidMap cannot track multiple DNs on the same host
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6171a41 HDDS-2199. In SCMNodeManager dnsToUuidMap cannot track multiple DNs on the same host
6171a41 is described below
commit 6171a41b4c29a4039b53209df546c4c42a278464
Author: S O'Donnell <so...@cloudera.com>
AuthorDate: Fri Oct 4 14:00:06 2019 +0200
HDDS-2199. In SCMNodeManager dnsToUuidMap cannot track multiple DNs on the same host
Closes #1551
---
.../apache/hadoop/hdds/scm/node/NodeManager.java | 8 +--
.../hadoop/hdds/scm/node/SCMNodeManager.java | 51 ++++++++++++----
.../hdds/scm/server/SCMBlockProtocolServer.java | 7 ++-
.../hadoop/hdds/scm/container/MockNodeManager.java | 36 ++++++++++--
.../hadoop/hdds/scm/node/TestSCMNodeManager.java | 67 +++++++++++++++++++++-
.../testutils/ReplicationNodeManagerMock.java | 5 +-
6 files changed, 149 insertions(+), 25 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
index d8890fb..fd8bb87 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
@@ -192,11 +192,11 @@ public interface NodeManager extends StorageContainerNodeProtocol,
DatanodeDetails getNodeByUuid(String uuid);
/**
- * Given datanode address(Ipaddress or hostname), returns the DatanodeDetails
- * for the node.
+ * Given datanode address(Ipaddress or hostname), returns a list of
+ * DatanodeDetails for the datanodes running at that address.
*
* @param address datanode address
- * @return the given datanode, or null if not found
+ * @return the given datanode, or empty list if none found
*/
- DatanodeDetails getNodeByAddress(String address);
+ List<DatanodeDetails> getNodesByAddress(String address);
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index d3df858..ed65ed3 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -25,11 +25,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.LinkedList;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
import java.util.stream.Collectors;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState;
@@ -98,7 +100,7 @@ public class SCMNodeManager implements NodeManager {
private final NetworkTopology clusterMap;
private final DNSToSwitchMapping dnsToSwitchMapping;
private final boolean useHostname;
- private final ConcurrentHashMap<String, String> dnsToUuidMap =
+ private final ConcurrentHashMap<String, Set<String>> dnsToUuidMap =
new ConcurrentHashMap<>();
/**
@@ -260,7 +262,7 @@ public class SCMNodeManager implements NodeManager {
}
nodeStateManager.addNode(datanodeDetails);
clusterMap.add(datanodeDetails);
- dnsToUuidMap.put(dnsName, datanodeDetails.getUuidString());
+ addEntryTodnsToUuidMap(dnsName, datanodeDetails.getUuidString());
// Updating Node Report, as registration is successful
processNodeReport(datanodeDetails, nodeReport);
LOG.info("Registered Data node : {}", datanodeDetails);
@@ -276,6 +278,26 @@ public class SCMNodeManager implements NodeManager {
}
/**
+ * Add an entry to the dnsToUuidMap, which maps hostname / IP to the DNs
+ * running on that host. As each address can have many DNs running on it,
+ * this is a one to many mapping.
+ * @param dnsName String representing the hostname or IP of the node
+ * @param uuid String representing the UUID of the registered node.
+ */
+ @SuppressFBWarnings(value="AT_OPERATION_SEQUENCE_ON_CONCURRENT_ABSTRACTION",
+ justification="The method is synchronized and this is the only place "+
+ "dnsToUuidMap is modified")
+ private synchronized void addEntryTodnsToUuidMap(
+ String dnsName, String uuid) {
+ Set<String> dnList = dnsToUuidMap.get(dnsName);
+ if (dnList == null) {
+ dnList = ConcurrentHashMap.newKeySet();
+ dnsToUuidMap.put(dnsName, dnList);
+ }
+ dnList.add(uuid);
+ }
+
+ /**
* Send heartbeat to indicate the datanode is alive and doing well.
*
* @param datanodeDetails - DatanodeDetailsProto.
@@ -584,29 +606,34 @@ public class SCMNodeManager implements NodeManager {
}
/**
- * Given datanode address(Ipaddress or hostname), returns the DatanodeDetails
- * for the node.
+ * Given datanode address(Ipaddress or hostname), return a list of
+ * DatanodeDetails for the datanodes registered on that address.
*
* @param address datanode address
- * @return the given datanode, or null if not found
+ * @return the given datanode, or empty list if none found
*/
@Override
- public DatanodeDetails getNodeByAddress(String address) {
+ public List<DatanodeDetails> getNodesByAddress(String address) {
+ List<DatanodeDetails> results = new LinkedList<>();
if (Strings.isNullOrEmpty(address)) {
LOG.warn("address is null");
- return null;
+ return results;
}
- String uuid = dnsToUuidMap.get(address);
- if (uuid != null) {
+ Set<String> uuids = dnsToUuidMap.get(address);
+ if (uuids == null) {
+ LOG.warn("Cannot find node for address {}", address);
+ return results;
+ }
+
+ for (String uuid : uuids) {
DatanodeDetails temp = DatanodeDetails.newBuilder().setUuid(uuid).build();
try {
- return nodeStateManager.getNode(temp);
+ results.add(nodeStateManager.getNode(temp));
} catch (NodeNotFoundException e) {
LOG.warn("Cannot find node for uuid {}", uuid);
}
}
- LOG.warn("Cannot find node for address {}", address);
- return null;
+ return results;
}
private String nodeResolve(String hostname) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
index 5500891..9c69758 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
@@ -295,7 +295,12 @@ public class SCMBlockProtocolServer implements
boolean auditSuccess = true;
try{
NodeManager nodeManager = scm.getScmNodeManager();
- Node client = nodeManager.getNodeByAddress(clientMachine);
+ Node client = null;
+ List<DatanodeDetails> possibleClients =
+ nodeManager.getNodesByAddress(clientMachine);
+ if (possibleClients.size()>0){
+ client = possibleClients.get(0);
+ }
List<Node> nodeList = new ArrayList();
nodes.stream().forEach(uuid -> {
DatanodeDetails node = nodeManager.getNodeByUuid(uuid);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
index b7a9813..6f5d435 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
@@ -88,7 +88,7 @@ public class MockNodeManager implements NodeManager {
private final Node2PipelineMap node2PipelineMap;
private final Node2ContainerMap node2ContainerMap;
private NetworkTopology clusterMap;
- private ConcurrentHashMap<String, String> dnsToUuidMap;
+ private ConcurrentHashMap<String, Set<String>> dnsToUuidMap;
public MockNodeManager(boolean initializeFakeNodes, int nodeCount) {
this.healthyNodes = new LinkedList<>();
@@ -386,7 +386,7 @@ public class MockNodeManager implements NodeManager {
try {
node2ContainerMap.insertNewDatanode(datanodeDetails.getUuid(),
Collections.emptySet());
- dnsToUuidMap.put(datanodeDetails.getIpAddress(),
+ addEntryTodnsToUuidMap(datanodeDetails.getIpAddress(),
datanodeDetails.getUuidString());
if (clusterMap != null) {
datanodeDetails.setNetworkName(datanodeDetails.getUuidString());
@@ -399,6 +399,23 @@ public class MockNodeManager implements NodeManager {
}
/**
+ * Add an entry to the dnsToUuidMap, which maps hostname / IP to the DNs
+ * running on that host. As each address can have many DNs running on it,
+ * this is a one to many mapping.
+ * @param dnsName String representing the hostname or IP of the node
+ * @param uuid String representing the UUID of the registered node.
+ */
+ private synchronized void addEntryTodnsToUuidMap(
+ String dnsName, String uuid) {
+ Set<String> dnList = dnsToUuidMap.get(dnsName);
+ if (dnList == null) {
+ dnList = ConcurrentHashMap.newKeySet();
+ dnsToUuidMap.put(dnsName, dnList);
+ }
+ dnList.add(uuid);
+ }
+
+ /**
* Send heartbeat to indicate the datanode is alive and doing well.
*
* @param datanodeDetails - Datanode ID.
@@ -484,8 +501,19 @@ public class MockNodeManager implements NodeManager {
}
@Override
- public DatanodeDetails getNodeByAddress(String address) {
- return getNodeByUuid(dnsToUuidMap.get(address));
+ public List<DatanodeDetails> getNodesByAddress(String address) {
+ List<DatanodeDetails> results = new LinkedList<>();
+ Set<String> uuids = dnsToUuidMap.get(address);
+ if (uuids == null) {
+ return results;
+ }
+ for(String uuid : uuids) {
+ DatanodeDetails dn = getNodeByUuid(uuid);
+ if (dn != null) {
+ results.add(dn);
+ }
+ }
+ return results;
}
public void setNetworkTopology(NetworkTopology topology) {
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
index d028851..db76d66 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
@@ -1065,6 +1065,25 @@ public class TestSCMNodeManager {
}
/**
+ * Test getNodesByAddress when using IPs.
+ *
+ */
+ @Test
+ public void testgetNodesByAddressWithIpAddress()
+ throws IOException, InterruptedException, AuthenticationException {
+ testGetNodesByAddress(false);
+ }
+
+ /**
+ * Test getNodesByAddress when using hostnames.
+ */
+ @Test
+ public void testgetNodesByAddressWithHostname()
+ throws IOException, InterruptedException, AuthenticationException {
+ testGetNodesByAddress(true);
+ }
+
+ /**
* Test add node into a 4-layer network topology during node register.
*/
@Test
@@ -1152,11 +1171,55 @@ public class TestSCMNodeManager {
// test get node
if (useHostname) {
Arrays.stream(hostNames).forEach(hostname ->
- Assert.assertNotNull(nodeManager.getNodeByAddress(hostname)));
+ Assert.assertNotEquals(0, nodeManager.getNodesByAddress(hostname)
+ .size()));
} else {
Arrays.stream(ipAddress).forEach(ip ->
- Assert.assertNotNull(nodeManager.getNodeByAddress(ip)));
+ Assert.assertNotEquals(0, nodeManager.getNodesByAddress(ip)
+ .size()));
}
}
}
+
+ /**
+ * Test add node into a 4-layer network topology during node register.
+ */
+ private void testGetNodesByAddress(boolean useHostname)
+ throws IOException, InterruptedException, AuthenticationException {
+ OzoneConfiguration conf = getConf();
+ conf.setTimeDuration(OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL, 1000,
+ MILLISECONDS);
+
+ // create a set of hosts - note two hosts on "host1"
+ String[] hostNames = {"host1", "host1", "host2", "host3", "host4"};
+ String[] ipAddress =
+ {"1.2.3.4", "1.2.3.4", "2.3.4.5", "3.4.5.6", "4.5.6.7"};
+
+ if (useHostname) {
+ conf.set(DFSConfigKeys.DFS_DATANODE_USE_DN_HOSTNAME, "true");
+ }
+ final int nodeCount = hostNames.length;
+ try (SCMNodeManager nodeManager = createNodeManager(conf)) {
+ DatanodeDetails[] nodes = new DatanodeDetails[nodeCount];
+ for (int i = 0; i < nodeCount; i++) {
+ DatanodeDetails node = TestUtils.createDatanodeDetails(
+ UUID.randomUUID().toString(), hostNames[i], ipAddress[i], null);
+ nodeManager.register(node, null, null);
+ }
+ // test get node
+ Assert.assertEquals(0, nodeManager.getNodesByAddress(null).size());
+ if (useHostname) {
+ Assert.assertEquals(2,
+ nodeManager.getNodesByAddress("host1").size());
+ Assert.assertEquals(1, nodeManager.getNodesByAddress("host2").size());
+ Assert.assertEquals(0, nodeManager.getNodesByAddress("unknown").size());
+ } else {
+ Assert.assertEquals(2,
+ nodeManager.getNodesByAddress("1.2.3.4").size());
+ Assert.assertEquals(1, nodeManager.getNodesByAddress("2.3.4.5").size());
+ Assert.assertEquals(0, nodeManager.getNodesByAddress("1.9.8.7").size());
+ }
+ }
+ }
+
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
index 30a75ef..0ecff3f5 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
@@ -44,6 +44,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import java.util.LinkedList;
/**
* A Node Manager to test replication.
@@ -323,7 +324,7 @@ public class ReplicationNodeManagerMock implements NodeManager {
}
@Override
- public DatanodeDetails getNodeByAddress(String address) {
- return null;
+ public List<DatanodeDetails> getNodesByAddress(String address) {
+ return new LinkedList<>();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org