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 2019/01/10 02:27:03 UTC
[hbase] branch branch-2 updated: HBASE-21695 Fix flaky test
TestRegionServerAbortTimeout
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 2cf13d0 HBASE-21695 Fix flaky test TestRegionServerAbortTimeout
2cf13d0 is described below
commit 2cf13d04a1bf19fa0c0ec95627b56f89862f58cd
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Tue Jan 8 16:52:53 2019 +0800
HBASE-21695 Fix flaky test TestRegionServerAbortTimeout
---
.../hadoop/hbase/regionserver/TestRegionServerAbortTimeout.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbortTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbortTimeout.java
index f134519..7a92664 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbortTimeout.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbortTimeout.java
@@ -38,6 +38,7 @@ import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.coprocessor.RegionObserver;
+import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -89,6 +90,9 @@ public class TestRegionServerAbortTimeout {
@AfterClass
public static void tearDown() throws Exception {
+ // Wait the SCP of abort rs to finish
+ UTIL.waitFor(30000, () -> UTIL.getMiniHBaseCluster().getMaster().getProcedures().stream()
+ .filter(p -> p instanceof ServerCrashProcedure && p.isFinished()).count() > 0);
UTIL.getAdmin().disableTable(TABLE_NAME);
UTIL.getAdmin().deleteTable(TABLE_NAME);
UTIL.shutdownMiniCluster();