[hbase] branch branch-2.3 updated: HBASE-24161 [flakey test] locking.TestEntityLocks.testEntityLockTimeout (#1477) (#1481)

[hu...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2.3 by this push:
     new 5e11ff1  HBASE-24161 [flakey test] locking.TestEntityLocks.testEntityLockTimeout (#1477) (#1481)
5e11ff1 is described below

commit 5e11ff100a2d2161be7d69c3db75974bb21641ea
Author: huaxiangsun <hu...@apache.org>
AuthorDate: Fri Apr 10 09:40:50 2020 -0700

    HBASE-24161 [flakey test] locking.TestEntityLocks.testEntityLockTimeout (#1477) (#1481)
    
    Signed-off-by: stack <st...@apache.org>
---
 .../java/org/apache/hadoop/hbase/client/locking/TestEntityLocks.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/locking/TestEntityLocks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/locking/TestEntityLocks.java
index 39e70ad..5a2a893 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/locking/TestEntityLocks.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/locking/TestEntityLocks.java
@@ -175,7 +175,10 @@ public class TestEntityLocks {
     assertTrue(lock.isLocked());
     // Should get unlocked in next heartbeat i.e. after workerSleepTime. Wait 10x time to be sure.
     assertTrue(waitLockTimeOut(lock, 10 * workerSleepTime));
-    assertFalse(lock.getWorker().isAlive());
+
+    // Works' run() returns, there is a small gap that the thread is still alive(os
+    // has not declare it is dead yet), so remove the following assertion.
+    // assertFalse(lock.getWorker().isAlive());
     verify(abortable, times(1)).abort(any(), eq(null));
   }