From 4a33e13b2dab1dc60ce573ef0afea60a614343e1 Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Wed, 28 Jun 2017 16:03:02 -0700 Subject: [PATCH] HBASE-18292 Fixed flaky test hbase.master.locking.TestLockProcedure#testLocalMasterLockRecovery --- .../apache/hadoop/hbase/master/locking/TestLockProcedure.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java index d2a2c9371c2b57527910d6529391992a7fcca3d4..ac157e4f09c7af46eb94b33342279f1603ad74cf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java @@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException; import org.apache.hadoop.hbase.shaded.protobuf.generated.LockServiceProtos.*; import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.apache.hadoop.hbase.util.Pair; import org.hamcrest.core.IsInstanceOf; import org.hamcrest.core.StringStartsWith; import org.junit.rules.TestRule; @@ -74,8 +75,8 @@ public class TestLockProcedure { @Rule public TestName testName = new TestName(); // crank this up if this test turns out to be flaky. - private static final int HEARTBEAT_TIMEOUT = 1000; - private static final int LOCAL_LOCKS_TIMEOUT = 2000; + private static final int HEARTBEAT_TIMEOUT = 2000; + private static final int LOCAL_LOCKS_TIMEOUT = 4000; private static final Log LOG = LogFactory.getLog(TestLockProcedure.class); protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); @@ -438,9 +439,9 @@ public class TestLockProcedure { Thread.sleep(250); } assertEquals(true, procExec.isRunning()); - LockProcedure proc = (LockProcedure) procExec.getProcedure(lockProc.getProcId()); - assertTrue(proc == null || !proc.isLocked()); ProcedureTestingUtility.waitProcedure(procExec, lockProc.getProcId()); + Pair result = procExec.getResultOrProcedure(lockProc.getProcId()); + assertTrue(result.getFirst() != null && !result.getFirst().isFailed()); ProcedureTestingUtility.assertProcNotFailed(procExec, lockProc.getProcId()); } } -- 2.10.1 (Apple Git-78)