From 82d56b337d468f4065df5005f9f67487ac97d2d7 Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Wed, 8 Apr 2015 16:02:45 -0700 Subject: [PATCH] Revert HDFS-7813. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 --- .../apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java | 1 - 2 files changed, 4 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index d4a8c0b2d44..b2037700920 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1241,9 +1241,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) 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 2910004f943..ee1c1845b30 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"));