This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 2c7b185 Revert "HBASE-26027 The calling of HTable.batch blocked at
AsyncRequestFuture… (#3419)"
2c7b185 is described below
commit 2c7b185431579134d2dcbec5846faddea3518a42
Author: stack <[email protected]>
AuthorDate: Thu Jul 22 21:06:27 2021 -0700
Revert "HBASE-26027 The calling of HTable.batch blocked at
AsyncRequestFuture… (#3419)"
This reverts commit 1d6eb77ef8e813ce1050afe6d71954462ab0c28a.
---
.../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 e982fa2..d2486cc 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
@@ -1140,15 +1140,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 {
