Repository: hadoop Updated Branches: refs/heads/HDFS-EC 041e97d79 -> bdc01015c
HDFS-7303. NN UI fails to distinguish datanodes on the same host. Contributed by Benoy Antony. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/45fa7f02 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/45fa7f02 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/45fa7f02 Branch: refs/heads/HDFS-EC Commit: 45fa7f023532e79dff3cf381056eff717dc4ecc7 Parents: 8caf537 Author: Haohui Mai <whe...@apache.org> Authored: Mon Nov 24 17:46:35 2014 -0800 Committer: Haohui Mai <whe...@apache.org> Committed: Mon Nov 24 17:46:35 2014 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 5 ++++- .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 7 +++---- .../hadoop/hdfs/server/namenode/TestNameNodeMXBean.java | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/45fa7f02/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index e2116b0..3cd8e15 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -480,9 +480,12 @@ Release 2.7.0 - UNRELEASED HDFS-7374. Allow decommissioning of dead DataNodes. (Zhe Zhang) - HDFS-7403. Inaccurate javadoc of BlockUCState#COMPLETE state. ( + HDFS-7403. Inaccurate javadoc of BlockUCState#COMPLETE state. ( Yongjun Zhang via yliu) + HDFS-7303. NN UI fails to distinguish datanodes on the same host. + (Benoy Antony via wheat9) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/45fa7f02/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 4059905..899c126 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -7248,8 +7248,7 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, .put("blockPoolUsedPercent", node.getBlockPoolUsedPercent()) .put("volfails", node.getVolumeFailures()) .build(); - - info.put(node.getHostName(), innerinfo); + info.put(node.getHostName() + ":" + node.getXferPort(), innerinfo); } return JSON.toString(info); } @@ -7270,7 +7269,7 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, .put("decommissioned", node.isDecommissioned()) .put("xferaddr", node.getXferAddr()) .build(); - info.put(node.getHostName(), innerinfo); + info.put(node.getHostName() + ":" + node.getXferPort(), innerinfo); } return JSON.toString(info); } @@ -7297,7 +7296,7 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, .put("underReplicateInOpenFiles", node.decommissioningStatus.getUnderReplicatedInOpenFiles()) .build(); - info.put(node.getHostName(), innerinfo); + info.put(node.getHostName() + ":" + node.getXferPort(), innerinfo); } return JSON.toString(info); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/45fa7f02/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java index fa9dca1..03ade90 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java @@ -67,7 +67,7 @@ public class TestNameNodeMXBean { MiniDFSCluster cluster = null; try { - cluster = new MiniDFSCluster.Builder(conf).build(); + cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2).build(); cluster.waitActive(); FSNamesystem fsn = cluster.getNameNode().namesystem; @@ -111,7 +111,7 @@ public class TestNameNodeMXBean { "LiveNodes")); Map<String, Map<String, Object>> liveNodes = (Map<String, Map<String, Object>>) JSON.parse(alivenodeinfo); - assertTrue(liveNodes.size() > 0); + assertTrue(liveNodes.size() == 2); for (Map<String, Object> liveNode : liveNodes.values()) { assertTrue(liveNode.containsKey("nonDfsUsedSpace")); assertTrue(((Long)liveNode.get("nonDfsUsedSpace")) > 0);