Repository: hbase Updated Branches: refs/heads/master 115929654 -> 4e77b18da
HBASE-17592 Fix rpcTimeout typo (Attila Sasvari) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4e77b18d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4e77b18d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4e77b18d Branch: refs/heads/master Commit: 4e77b18da2515a14772a456f408ee34376a3c71f Parents: 1159296 Author: Josh Elser <[email protected]> Authored: Fri Feb 3 16:50:19 2017 -0500 Committer: Josh Elser <[email protected]> Committed: Fri Feb 3 16:50:19 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4e77b18d/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java index 2ee141c..44e98fe 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java @@ -176,7 +176,7 @@ class IPCUtil { static void setCancelled(Call call) { call.setException(new CallCancelledException("Call id=" + call.id + ", waitTime=" - + (EnvironmentEdgeManager.currentTime() - call.getStartTime()) + ", rpcTimetout=" + + (EnvironmentEdgeManager.currentTime() - call.getStartTime()) + ", rpcTimeout=" + call.timeout)); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/4e77b18d/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java index c9002e7..b5a7959 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java @@ -193,7 +193,7 @@ abstract class RpcConnection { @Override public void run(Timeout timeout) throws Exception { call.setTimeout(new CallTimeoutException("Call id=" + call.id + ", waitTime=" - + (EnvironmentEdgeManager.currentTime() - call.getStartTime()) + ", rpcTimetout=" + + (EnvironmentEdgeManager.currentTime() - call.getStartTime()) + ", rpcTimeout=" + call.timeout)); callTimeout(call); }
