This is an automated email from the ASF dual-hosted git repository.
stack 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 bda0881bf90 HDFS-16540 Data locality is lost when DataNode pod
restarts in kubernetes (#4170)
bda0881bf90 is described below
commit bda0881bf90ae64b32dbaf7b42413e18598e434d
Author: huaxiangsun <huaxiang...@apache.org>
AuthorDate: Thu Apr 28 10:24:37 2022 -0700
HDFS-16540 Data locality is lost when DataNode pod restarts in kubernetes
(#4170)
When DN with the same UUID is registered with a different IP,
host2DatanodeMap needs to be updated accordingly.
---
.BUILDING.txt.swp | Bin 0 -> 16384 bytes
.../server/blockmanagement/DatanodeManager.java | 17 +++++++++++-
.../blockmanagement/TestDatanodeManager.java | 29 +++++++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/.BUILDING.txt.swp b/.BUILDING.txt.swp
new file mode 100644
index 00000000000..1fb0c25d0a5
Binary files /dev/null and b/.BUILDING.txt.swp differ
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index a9850aa7f5a..fa4f573da56 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -1171,6 +1171,7 @@ public class DatanodeManager {
nodeN = null;
}
+ boolean updateHost2DatanodeMap = false;
if (nodeS != null) {
if (nodeN == nodeS) {
// The same datanode has been just restarted to serve the same data
@@ -1189,7 +1190,11 @@ public class DatanodeManager {
nodes with its data cleared (or user can just remove the StorageID
value in "VERSION" file under the data directory of the datanode,
but this is might not work if VERSION file format has changed
- */
+ */
+ // Check if nodeS's host information is same as nodeReg's, if not,
+ // it needs to update host2DatanodeMap accordringly.
+ updateHost2DatanodeMap =
!nodeS.getXferAddr().equals(nodeReg.getXferAddr());
+
NameNode.stateChangeLog.info("BLOCK* registerDatanode: " + nodeS
+ " is replaced by " + nodeReg + " with the same storageID "
+ nodeReg.getDatanodeUuid());
@@ -1199,6 +1204,11 @@ public class DatanodeManager {
try {
// update cluster map
getNetworkTopology().remove(nodeS);
+
+ // Update Host2DatanodeMap
+ if (updateHost2DatanodeMap) {
+ getHost2DatanodeMap().remove(nodeS);
+ }
if(shouldCountVersion(nodeS)) {
decrementVersionCount(nodeS.getSoftwareVersion());
}
@@ -1217,6 +1227,11 @@ public class DatanodeManager {
nodeS.setDependentHostNames(
getNetworkDependenciesWithDefault(nodeS));
}
+
+ if (updateHost2DatanodeMap) {
+ getHost2DatanodeMap().add(nodeS);
+ }
+
getNetworkTopology().add(nodeS);
resolveUpgradeDomain(nodeS);
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeManager.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeManager.java
index 5f5452ac16d..232424d4404 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeManager.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeManager.java
@@ -138,6 +138,35 @@ public class TestDatanodeManager {
mapToCheck.get("version1").intValue(), 1);
}
+ /**
+ * This test checks that if a node is re-registered with a different ip, its
+ * host2DatanodeMap is correctly updated with the new ip.
+ */
+ @Test
+ public void testHost2NodeMapCorrectAfterReregister()
+ throws IOException, InterruptedException {
+ //Create the DatanodeManager which will be tested
+ FSNamesystem fsn = Mockito.mock(FSNamesystem.class);
+ Mockito.when(fsn.hasWriteLock()).thenReturn(true);
+ Configuration conf = new Configuration();
+ DatanodeManager dm = mockDatanodeManager(fsn, conf);
+
+ String storageID = "someStorageID1";
+ String ipOld = "someIPOld" + storageID;
+ String ipNew = "someIPNew" + storageID;
+
+ dm.registerDatanode(new DatanodeRegistration(
+ new DatanodeID(ipOld, "", storageID, 9000, 0, 0, 0),
+ null, null, "version"));
+
+ dm.registerDatanode(new DatanodeRegistration(
+ new DatanodeID(ipNew, "", storageID, 9000, 0, 0, 0),
+ null, null, "version"));
+
+ assertNull("should be no node with old ip", dm.getDatanodeByHost(ipOld));
+ assertNotNull("should be a node with new ip", dm.getDatanodeByHost(ipNew));
+ }
+
/**
* This test sends a random sequence of node registrations and node removals
* to the DatanodeManager (of nodes with different IDs and versions), and
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
