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

HBASE-11374 RpcRetryingCaller#callWithoutRetries has a timeout of zero

This commit is contained in:
Nicolas Liochon 2014-06-20 10:15:26 +02:00
parent 890618bb11
commit c75afc5b8f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
View File

@ -154,7 +154,7 @@ class AsyncProcess {
protected final long pause; protected final long pause;
protected int numTries; protected int numTries;
protected int serverTrackerTimeout; protected int serverTrackerTimeout;
protected int operationTimeout; protected int timeout;
// End configuration settings. // End configuration settings.
protected static class BatchErrors { protected static class BatchErrors {
@ -205,8 +205,8 @@ class AsyncProcess {
HConstants.DEFAULT_HBASE_CLIENT_PAUSE); HConstants.DEFAULT_HBASE_CLIENT_PAUSE);
this.numTries = conf.getInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, this.numTries = conf.getInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER,
HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER); HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER);
this.operationTimeout = conf.getInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, this.timeout = conf.getInt(HConstants.HBASE_RPC_TIMEOUT_KEY,
HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT); HConstants.DEFAULT_HBASE_RPC_TIMEOUT);
this.maxTotalConcurrentTasks = conf.getInt(HConstants.HBASE_CLIENT_MAX_TOTAL_TASKS, this.maxTotalConcurrentTasks = conf.getInt(HConstants.HBASE_CLIENT_MAX_TOTAL_TASKS,
HConstants.DEFAULT_HBASE_CLIENT_MAX_TOTAL_TASKS); HConstants.DEFAULT_HBASE_CLIENT_MAX_TOTAL_TASKS);
@ -596,7 +596,7 @@ class AsyncProcess {
try { try {
MultiServerCallable<Row> callable = createCallable(server, tableName, multiAction); MultiServerCallable<Row> callable = createCallable(server, tableName, multiAction);
try { try {
res = createCaller(callable).callWithoutRetries(callable, operationTimeout); res = createCaller(callable).callWithoutRetries(callable, timeout);
} catch (IOException e) { } catch (IOException e) {
// The service itself failed . It may be an error coming from the communication // The service itself failed . It may be an error coming from the communication
// layer, but, as well, a functional error raised by the server. // layer, but, as well, a functional error raised by the server.