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/09 14:01:46 UTC
hbase git commit: HBASE-21695 Fix flaky test
TestRegionServerAbortTimeout
Repository: hbase
Updated Branches:
refs/heads/master 37bc1686d -> a5a61163f
HBASE-21695 Fix flaky test TestRegionServerAbortTimeout
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a5a61163
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a5a61163
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a5a61163
Branch: refs/heads/master
Commit: a5a61163f1931c452f952745d494b5a4a81ba99d
Parents: 37bc168
Author: Guanghao Zhang <zg...@apache.org>
Authored: Tue Jan 8 16:52:53 2019 +0800
Committer: Guanghao Zhang <zg...@apache.org>
Committed: Wed Jan 9 21:58:19 2019 +0800
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/TestRegionServerAbortTimeout.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5a61163/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbortTimeout.java
----------------------------------------------------------------------
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();