[hbase] branch branch-2.4 updated: HBASE-27205 Fix tests that rely on EnvironmentEdgeManager in branch-2.4 (addendum) (#4631)

[bbeaudreault]

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

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


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new f5f248d0547 HBASE-27205 Fix tests that rely on EnvironmentEdgeManager 
in branch-2.4 (addendum) (#4631)
f5f248d0547 is described below

commit f5f248d05479ae8590b957c37066596b8c50fe4a
Author: Bryan Beaudreault <bbeaudrea...@hubspot.com>
AuthorDate: Mon Jul 18 14:54:26 2022 -0400

    HBASE-27205 Fix tests that rely on EnvironmentEdgeManager in branch-2.4 
(addendum) (#4631)
    
    Signed-off-by: Andrew Purtell <apurt...@apache.org>
    Signed-off-by: Viraj Jasani <vjas...@apache.org>
---
 .../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2398be5b5a3..d9a5eb8566f 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
@@ -6502,7 +6502,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver, Regi
       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;