Repository: hadoop Updated Branches: refs/heads/branch-2.7 eb53d6b96 -> 84ba4db2a
Revert HDFS-7813. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84ba4db2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84ba4db2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84ba4db2 Branch: refs/heads/branch-2.7 Commit: 84ba4db2a0259d50d3327305f89d90549ea3d820 Parents: eb53d6b Author: Haohui Mai <whe...@apache.org> Authored: Wed Apr 8 16:02:45 2015 -0700 Committer: Haohui Mai <whe...@apache.org> Committed: Wed Apr 8 16:03:35 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 --- .../org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java | 1 - 2 files changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ba4db2/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 8f0d80d..54b52d3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -799,9 +799,6 @@ Release 2.7.0 - UNRELEASED HDFS-7814. Fix usage string of storageType parameter for "dfsadmin -setSpaceQuota/clrSpaceQuota". (Xiaoyu Yao via cnauroth) - HDFS-7813. TestDFSHAAdminMiniCluster#testFencer testcase is failing - frequently. (Rakesh R via cnauroth) - HDFS-7009. Active NN and standby NN have different live nodes. (Ming Ma via cnauroth) http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ba4db2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java index 2910004..ee1c184 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java @@ -155,7 +155,6 @@ public class TestDFSHAAdminMiniCluster { tool.setConf(conf); assertEquals(0, runTool("-transitionToActive", "nn1")); assertEquals(0, runTool("-failover", "nn1", "nn2")); - assertEquals(0, runTool("-failover", "nn2", "nn1")); // Test failover with fencer and nameservice assertEquals(0, runTool("-ns", "minidfs-ns", "-failover", "nn2", "nn1"));
