diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 04504afe39a3..7317b71c905e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -6506,7 +6506,7 @@ protected RowLock getRowLockInternal(byte[] row, boolean readLock, final RowLock if (call.isPresent()) { long deadline = call.get().getDeadline(); if (deadline < Long.MAX_VALUE) { - int timeToDeadline = (int) (deadline - System.currentTimeMillis()); + int timeToDeadline = (int) (deadline - EnvironmentEdgeManager.currentTime()); if (timeToDeadline <= this.rowLockWaitDuration) { reachDeadlineFirst = true; timeout = timeToDeadline;