hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iwasak...@apache.org
Subject hadoop git commit: HDFS-9599. TestDecommissioningStatus.testDecommissionStatus occasionally fails (Lin Yiqun via iwasakims)
Date Mon, 04 Apr 2016 18:47:09 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 334beb337 -> 97cda4077


HDFS-9599. TestDecommissioningStatus.testDecommissionStatus occasionally fails (Lin Yiqun
via iwasakims)

(cherry picked from commit 154d2532cf015e9ab9141864bd3ab0d6100ef597)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/97cda407
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/97cda407
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/97cda407

Branch: refs/heads/branch-2.8
Commit: 97cda4077a7088e487340635c15d1d406a63b791
Parents: 334beb3
Author: Masatake Iwasaki <iwasakims@apache.org>
Authored: Tue Apr 5 03:19:48 2016 +0900
Committer: Masatake Iwasaki <iwasakims@apache.org>
Committed: Tue Apr 5 03:44:12 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/97cda407/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 1c5d369..02b5ebb 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();


Mime
View raw message