[hbase] branch branch-2.3 updated: Revert "HBASE-26027 The calling of HTable.batch blocked at AsyncRequestFuture… (#3419)"

[stack]

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

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


The following commit(s) were added to refs/heads/branch-2.3 by this push:
     new bde8bfb  Revert "HBASE-26027 The calling of HTable.batch blocked at 
AsyncRequestFuture… (#3419)"
bde8bfb is described below

commit bde8bfbf9eb23839e7e5f24760473bd1bd168967
Author: stack <st...@apache.org>
AuthorDate: Thu Jul 22 21:02:02 2021 -0700

    Revert "HBASE-26027 The calling of HTable.batch blocked at 
AsyncRequestFuture… (#3419)"
    
    This reverts commit 9c7d9fa229ea97c288fc1f6843bb05a7a4df4b87.
---
 .../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
index c26ebdc..e46a50e 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
@@ -1148,15 +1148,7 @@ class AsyncRequestFutureImpl<CResult> implements 
AsyncRequestFuture {
   @Override
   public void waitUntilDone() throws InterruptedIOException {
     try {
-      if (this.operationTimeout > 0) {
-        // the worker thread maybe over by some exception without decrement 
the actionsInProgress,
-        // then the guarantee of operationTimeout will be broken, so we should 
set cutoff to avoid
-        // stuck here forever
-        long cutoff = (EnvironmentEdgeManager.currentTime() + 
this.operationTimeout) * 1000L;
-        waitUntilDone(cutoff);
-      } else {
-        waitUntilDone(Long.MAX_VALUE);
-      }
+      waitUntilDone(Long.MAX_VALUE);
     } catch (InterruptedException iex) {
       throw new InterruptedIOException(iex.getMessage());
     } finally {