[hbase] branch branch-2.1 updated: HBASE-21854 Race condition in TestProcedureSkipPersistence

[ps...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 3076532  HBASE-21854 Race condition in TestProcedureSkipPersistence
3076532 is described below

commit 307653281d3477d88046644a355617bbf811a7b9
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Feb 11 16:33:14 2019 +0800

    HBASE-21854 Race condition in TestProcedureSkipPersistence
    
    Signed-off-by: Peter Somogyi <ps...@apache.org>
---
 .../apache/hadoop/hbase/procedure2/TestProcedureSkipPersistence.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSkipPersistence.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSkipPersistence.java
index 8293dcb..2ddc732 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSkipPersistence.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSkipPersistence.java
@@ -148,11 +148,11 @@ public class TestProcedureSkipPersistence {
   public void test() throws Exception {
     TestProcedure proc = new TestProcedure();
     long procId = procExecutor.submitProcedure(proc);
-    htu.waitFor(30000, () -> proc.isWaiting());
+    htu.waitFor(30000, () -> proc.isWaiting() && procExecutor.getActiveExecutorCount() == 0);
     ProcedureTestingUtility.restart(procExecutor);
     htu.waitFor(30000, () -> {
       Procedure<?> p = procExecutor.getProcedure(procId);
-      return p.isWaiting() || p.isFinished();
+      return (p.isWaiting() || p.isFinished()) && procExecutor.getActiveExecutorCount() == 0;
     });
     assertFalse(procExecutor.isFinished(procId));
     ProcedureTestingUtility.restart(procExecutor);