You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2020/06/09 00:22:11 UTC

[hbase] branch branch-2 updated: HBASE-24444 Should shutdown mini cluster after class in TestMetaAssignmentWithStopMaster (#1802)

This is an automated email from the ASF dual-hosted git repository.

zghao pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 9ba3be6  HBASE-24444 Should shutdown mini cluster after class in TestMetaAssignmentWithStopMaster (#1802)
9ba3be6 is described below

commit 9ba3be61b3d8519802e694ae3c804787556e93f7
Author: WenFeiYi <we...@gmail.com>
AuthorDate: Tue Jun 9 08:14:18 2020 +0800

    HBASE-24444 Should shutdown mini cluster after class in TestMetaAssignmentWithStopMaster (#1802)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
---
 .../hadoop/hbase/master/TestMetaAssignmentWithStopMaster.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.java
index 446c3f9..ac2f9ab 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.ClusterConnection;
 import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -50,12 +51,17 @@ public class TestMetaAssignmentWithStopMaster {
   private static final long WAIT_TIMEOUT = 120000;
 
   @BeforeClass
-  public static void setUp() throws Exception {
+  public static void setUpBeforeClass() throws Exception {
     StartMiniClusterOption option = StartMiniClusterOption.builder()
         .numMasters(2).numRegionServers(3).numDataNodes(3).build();
     UTIL.startMiniCluster(option);
   }
 
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    UTIL.shutdownMiniCluster();
+  }
+
   @Test
   public void testStopActiveMaster() throws Exception {
     ClusterConnection conn =