Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-21334 TestMergeTableRegionsProcedure is flakey

This commit is contained in:
zhangduo 2018-10-21 16:09:46 +08:00 committed by Duo Zhang
parent 492172505a
commit 6e5d1a4896
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java
View File

@ -491,13 +491,18 @@ public class MasterProcedureTestingUtility {
// Sometimes there are other procedures still executing (including asynchronously spawned by
// procId) and due to KillAndToggleBeforeStoreUpdate flag ProcedureExecutor is stopped before
// store update. Let all pending procedures finish normally.
if (!procExec.isRunning()) {
LOG.warn("ProcedureExecutor not running, may have been stopped by pending procedure due to"
+ " KillAndToggleBeforeStoreUpdate flag.");
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, false);
restartMasterProcedureExecutor(procExec);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, false);
// check 3 times to confirm that the procedure executor has not been killed
for (int i = 0; i < 3; i++) {
if (!procExec.isRunning()) {
LOG.warn("ProcedureExecutor not running, may have been stopped by pending procedure due" +
" to KillAndToggleBeforeStoreUpdate flag.");
restartMasterProcedureExecutor(procExec);
break;
}
Thread.sleep(1000);
}
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
}
assertEquals(true, procExec.isRunning());