From bb2a7aa4870a87c1ff1ab707cc093d0200a97d2a Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Mon, 11 Feb 2019 16:33:14 +0800 Subject: [PATCH] HBASE-21854 Race condition in TestProcedureSkipPersistence --- .../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 8293dcb4ed..2ddc732760 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); -- 2.17.1