From fdbdc471d9a1d89305e0ea2f640580784bb5dbc1 Mon Sep 17 00:00:00 2001 From: stack Date: Tue, 2 Jul 2019 20:33:50 -0700 Subject: [PATCH] HBASE-22652 Flakey TestLockManager; test timed out after 780 seconds --- .../apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java | 4 +++- 1 file changed, 3 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 4416177cfb..839abb15dd 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,9 @@ class TimeoutExecutorThread extends StoppableThread { } public void add(Procedure 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)); -- 2.19.1