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:21:29 UTC
[hbase] branch master updated (3b3bba1 -> 2131456)
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 3b3bba1 HBASE-24444 Should shutdown mini cluster after class in TestMetaAssignmentWithStopMaster (#1802)
new a4aa538 Revert "HBASE-24444 Should shutdown mini cluster after class in TestMetaAssignmentWithStopMaster (#1802)"
new 2131456 HBASE-24444 Should shutdown mini cluster after class in TestMetaAssignmentWithStopMaster (#1802)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[hbase] 02/02: HBASE-24444 Should shutdown mini cluster after class
in TestMetaAssignmentWithStopMaster (#1802)
Posted by zg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 2131456e540d0bfc48eea63cea730cc9343c5b44
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 0c2532e..425d08b 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
@@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -51,12 +52,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 {
try (Connection conn = ConnectionFactory.createConnection(UTIL.getConfiguration());
[hbase] 01/02: Revert "HBASE-24444 Should shutdown mini cluster
after class in TestMetaAssignmentWithStopMaster (#1802)"
Posted by zg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit a4aa5384f1054e980d800f4aa3e3943f3a66ab33
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Tue Jun 9 08:15:51 2020 +0800
Revert "HBASE-24444 Should shutdown mini cluster after class in TestMetaAssignmentWithStopMaster (#1802)"
This reverts commit 3b3bba1b64dc7aafbe35917d5928f0aee8a5dd53.
---
.../hadoop/hbase/master/TestMetaAssignmentWithStopMaster.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
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 425d08b..0c2532e 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
@@ -29,7 +29,6 @@ import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -52,17 +51,12 @@ public class TestMetaAssignmentWithStopMaster {
private static final long WAIT_TIMEOUT = 120000;
@BeforeClass
- public static void setUpBeforeClass() throws Exception {
+ public static void setUp() 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 {
try (Connection conn = ConnectionFactory.createConnection(UTIL.getConfiguration());