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 wh...@apache.org on 2015/04/09 01:03:23 UTC

hadoop git commit: Revert HDFS-7813.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 35816c438 -> 6d2eca081


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/6d2eca08
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6d2eca08
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6d2eca08

Branch: refs/heads/branch-2
Commit: 6d2eca081d21767313d529707654182482a0ec07
Parents: 35816c4
Author: Haohui Mai <wh...@apache.org>
Authored: Wed Apr 8 16:02:45 2015 -0700
Committer: Haohui Mai <wh...@apache.org>
Committed: Wed Apr 8 16:03:20 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/6d2eca08/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 4612a1d..26117e9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -934,9 +934,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/6d2eca08/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"));