Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-26027 The calling of HTable.batch blocked at AsyncRequestFuture… (#3419)" 

This reverts commit fe6c75cb50.
This commit is contained in:
Andrew Purtell 2021-07-20 10:00:25 -07:00
parent 02c796ca0e
commit 8ad467bce6
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
View File

@ -1140,15 +1140,7 @@ class AsyncRequestFutureImpl<CResult> implements AsyncRequestFuture {
@Override @Override
public void waitUntilDone() throws InterruptedIOException { public void waitUntilDone() throws InterruptedIOException {
try { try {
if (this.operationTimeout > 0) { waitUntilDone(Long.MAX_VALUE);
// 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);
}
} catch (InterruptedException iex) { } catch (InterruptedException iex) {
throw new InterruptedIOException(iex.getMessage()); throw new InterruptedIOException(iex.getMessage());
} finally { } finally {