HDFS-49. MiniDFSCluster.stopDataNode will always shut down a node in the cluster if a matching name is not found. (stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6b67115f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6b67115f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6b67115f Branch: refs/heads/HDFS-EC Commit: 6b67115f88ca72e732d47fd9103567302e2fcf5a Parents: 21c74e6 Author: Steve Loughran <ste...@apache.org> Authored: Tue Jan 27 11:10:46 2015 +0000 Committer: Zhe Zhang <z...@apache.org> Committed: Thu Jan 29 10:05:23 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6b67115f/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 39453d1..5189eab 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -790,6 +790,9 @@ Release 2.7.0 - UNRELEASED HDFS-7676. Fix TestFileTruncate to avoid bug of HDFS-7611. (shv) + HDFS-49. MiniDFSCluster.stopDataNode will always shut down a node in + the cluster if a matching name is not found. (stevel) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/6b67115f/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java index 7367ffb..8551263 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java @@ -1923,6 +1923,9 @@ public class MiniDFSCluster { /* * Shutdown a particular datanode + * @param i node index + * @return null if the node index is out of range, else the properties of the + * removed node */ public synchronized DataNodeProperties stopDataNode(int i) { if (i < 0 || i >= dataNodes.size()) { @@ -1941,18 +1944,20 @@ public class MiniDFSCluster { /* * Shutdown a datanode by name. + * @return the removed datanode or null if there was no match */ public synchronized DataNodeProperties stopDataNode(String dnName) { - int i; - for (i = 0; i < dataNodes.size(); i++) { + int node = -1; + for (int i = 0; i < dataNodes.size(); i++) { DataNode dn = dataNodes.get(i).datanode; LOG.info("DN name=" + dnName + " found DN=" + dn + " with name=" + dn.getDisplayName()); if (dnName.equals(dn.getDatanodeId().getXferAddr())) { + node = i; break; } } - return stopDataNode(i); + return stopDataNode(node); } /**