HDFS-9599. TestDecommissioningStatus.testDecommissionStatus occasionally fails (Lin Yiqun via iwasakims)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/154d2532 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/154d2532 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/154d2532 Branch: refs/heads/HDFS-1312 Commit: 154d2532cf015e9ab9141864bd3ab0d6100ef597 Parents: 7280550 Author: Masatake Iwasaki <iwasak...@apache.org> Authored: Tue Apr 5 03:19:48 2016 +0900 Committer: Masatake Iwasaki <iwasak...@apache.org> Committed: Tue Apr 5 03:19:48 2016 +0900 ---------------------------------------------------------------------- .../hdfs/server/namenode/TestDecommissioningStatus.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/154d2532/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java index 789ee6f..1e7312a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java @@ -57,8 +57,8 @@ import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils; import org.apache.hadoop.hdfs.tools.DFSAdmin; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.After; +import org.junit.Before; import org.junit.Test; /** @@ -78,8 +78,8 @@ public class TestDecommissioningStatus { final ArrayList<String> decommissionedNodes = new ArrayList<String>(numDatanodes); - @BeforeClass - public static void setUp() throws Exception { + @Before + public void setUp() throws Exception { conf = new HdfsConfiguration(); conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_REPLICATION_CONSIDERLOAD_KEY, false); @@ -113,8 +113,8 @@ public class TestDecommissioningStatus { Logger.getLogger(DecommissionManager.class).setLevel(Level.DEBUG); } - @AfterClass - public static void tearDown() throws Exception { + @After + public void tearDown() throws Exception { if (localFileSys != null ) cleanupFile(localFileSys, dir); if(fileSys != null) fileSys.close(); if(cluster != null) cluster.shutdown();
