[hbase] branch branch-2.0 updated: HBASE-22652 Flakey TestLockManager; test timed out after 780 seconds Signed-off-by: Sean Busbey

[st...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new fc85563  HBASE-22652 Flakey TestLockManager; test timed out after 780 seconds Signed-off-by: Sean Busbey <bu...@apache.org>
fc85563 is described below

commit fc855637ea33b4d52562dbe1c86b8cc9e6af29fc
Author: stack <st...@apache.org>
AuthorDate: Tue Jul 2 20:33:50 2019 -0700

    HBASE-22652 Flakey TestLockManager; test timed out after 780 seconds
    Signed-off-by: Sean Busbey <bu...@apache.org>
---
 .../org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java
index 4416177..94d3f65 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java
@@ -78,7 +78,10 @@ class TimeoutExecutorThread<TEnvironment> extends StoppableThread {
   }
 
   public void add(Procedure<TEnvironment> procedure) {
-    assert procedure.getState() == ProcedureState.WAITING_TIMEOUT;
+    // On the assert, we expect WAITING_TIMEOUT but timing could make it so lock gets released by
+    // time we get here and in those cases the state could be back to RUNNABLE. Let it
+    assert procedure.getState() == ProcedureState.WAITING_TIMEOUT ||
+      procedure.getState() == ProcedureState.RUNNABLE;
     LOG.info("ADDED {}; timeout={}, timestamp={}", procedure, procedure.getTimeout(),
       procedure.getTimeoutTimestamp());
     queue.add(new DelayedProcedure<>(procedure));