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

HBASE-21715 set timeout instead of throwing Exception when calling ProcedureFuture.get in client side. 

Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
xujunhong 2019-01-23 19:42:59 +08:00 committed by Duo Zhang
parent 5d98f33b6b
commit d5d7732fb7
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
View File

@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.client;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
import com.google.protobuf.RpcController;
import java.io.Closeable;
import java.io.IOException;
import java.io.InterruptedIOException;
@ -44,6 +45,7 @@ import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Abortable;
import org.apache.hadoop.hbase.CacheEvictionStats;
@ -239,6 +241,7 @@ public class HBaseAdmin implements Admin {
private boolean aborted;
private int operationTimeout;
private int rpcTimeout;
private int getProcedureTimeout;
private RpcRetryingCallerFactory rpcCallerFactory;
private RpcControllerFactory rpcControllerFactory;
@ -265,6 +268,8 @@ public class HBaseAdmin implements Admin {
HConstants.DEFAULT_HBASE_RPC_TIMEOUT);
this.syncWaitTimeout = this.conf.getInt(
"hbase.client.sync.wait.timeout.msec", 10 * 60000); // 10min
this.getProcedureTimeout =
this.conf.getInt("hbase.client.procedure.future.get.timeout.msec", 10 * 60000); // 10min
this.rpcCallerFactory = connection.getRpcRetryingCallerFactory();
this.rpcControllerFactory = connection.getRpcControllerFactory();
@ -3408,7 +3413,15 @@ public class HBaseAdmin implements Admin {
@Override
public V get() throws InterruptedException, ExecutionException {
// TODO: should we ever spin forever?
throw new UnsupportedOperationException();
// fix HBASE-21715. TODO: If the function call get() without timeout limit is not allowed,
// is it possible to compose instead of inheriting from the class Future for this class?
try {
return get(admin.getProcedureTimeout, TimeUnit.MILLISECONDS);
} catch (TimeoutException e) {
LOG.warn("Failed to get the procedure with procId=" + procId + " throws exception " + e
.getMessage(), e);
return null;
}
}
@Override