[hbase] branch master updated: HBASE-22652 Flakey TestLockManager; test timed out after 780 seconds Signed-off-by: Duo Zhang

[st...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new be432b7  HBASE-22652 Flakey TestLockManager; test timed out after 780 seconds Signed-off-by: Duo Zhang <Ap...@apache.org>
be432b7 is described below

commit be432b7c4576de976cd04e14cebb446b016627d5
Author: stack <st...@apache.org>
AuthorDate: Wed Jul 3 07:47:00 2019 -0700

    HBASE-22652 Flakey TestLockManager; test timed out after 780 seconds
    Signed-off-by: Duo Zhang <Ap...@apache.org>
---
 .../org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java     | 4 ----
 1 file changed, 4 deletions(-)

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 94d3f65..1c97bcc 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,10 +78,6 @@ class TimeoutExecutorThread<TEnvironment> extends StoppableThread {
   }
 
   public void add(Procedure<TEnvironment> procedure) {
-    // 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));