Repository: hbase Updated Branches: refs/heads/master 890618bb1 -> c75afc5b8
HBASE-11374 RpcRetryingCaller#callWithoutRetries has a timeout of zero Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c75afc5b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c75afc5b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c75afc5b Branch: refs/heads/master Commit: c75afc5b8f5385f331ddbc60e117e4b2d1956121 Parents: 890618b Author: Nicolas Liochon <nkey...@gmail.com> Authored: Fri Jun 20 10:15:26 2014 +0200 Committer: Nicolas Liochon <nkey...@gmail.com> Committed: Fri Jun 20 10:15:26 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/client/AsyncProcess.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c75afc5b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java index fb3612f..42c1546 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java @@ -154,7 +154,7 @@ class AsyncProcess { protected final long pause; protected int numTries; protected int serverTrackerTimeout; - protected int operationTimeout; + protected int timeout; // End configuration settings. protected static class BatchErrors { @@ -205,8 +205,8 @@ class AsyncProcess { HConstants.DEFAULT_HBASE_CLIENT_PAUSE); this.numTries = conf.getInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER); - this.operationTimeout = conf.getInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, - HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT); + this.timeout = conf.getInt(HConstants.HBASE_RPC_TIMEOUT_KEY, + HConstants.DEFAULT_HBASE_RPC_TIMEOUT); this.maxTotalConcurrentTasks = conf.getInt(HConstants.HBASE_CLIENT_MAX_TOTAL_TASKS, HConstants.DEFAULT_HBASE_CLIENT_MAX_TOTAL_TASKS); @@ -596,7 +596,7 @@ class AsyncProcess { try { MultiServerCallable<Row> callable = createCallable(server, tableName, multiAction); try { - res = createCaller(callable).callWithoutRetries(callable, operationTimeout); + res = createCaller(callable).callWithoutRetries(callable, timeout); } catch (IOException e) { // The service itself failed . It may be an error coming from the communication // layer, but, as well, a functional error raised by the server.
