Repository: hbase Updated Branches: refs/heads/branch-1.3 2c18bb49b -> 9b65c7a26
Log the underlying RPC exception in RpcRetryingCallerImpl Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9b65c7a2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9b65c7a2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9b65c7a2 Branch: refs/heads/branch-1.3 Commit: 9b65c7a26d2d200d740d1cb6aed6c5e73e829dc1 Parents: 2c18bb4 Author: Jerry He <jerry...@apache.org> Authored: Fri Jul 1 14:05:25 2016 -0700 Committer: Jerry He <jerry...@apache.org> Committed: Fri Jul 1 14:05:25 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/client/RpcRetryingCaller.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9b65c7a2/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java index 76261b2..6f587d1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java @@ -139,16 +139,17 @@ public class RpcRetryingCaller<T> { throw e; } catch (Throwable t) { ExceptionUtil.rethrowIfInterrupt(t); + + // translateException throws exception when should not retry: i.e. when request is bad. + interceptor.handleFailure(context, t); + t = translateException(t); if (tries > startLogErrorsCnt) { LOG.info("Call exception, tries=" + tries + ", retries=" + retries + ", started=" + (EnvironmentEdgeManager.currentTime() - this.globalStartTime) + " ms ago, " + "cancelled=" + cancelled.get() + ", msg=" - + callable.getExceptionMessageAdditionalDetail()); + + t.getMessage() + " " + callable.getExceptionMessageAdditionalDetail()); } - // translateException throws exception when should not retry: i.e. when request is bad. - interceptor.handleFailure(context, t); - t = translateException(t); callable.throwable(t, retries != 1); RetriesExhaustedException.ThrowableWithExtraContext qt = new RetriesExhaustedException.ThrowableWithExtraContext(t, @@ -166,7 +167,7 @@ public class RpcRetryingCaller<T> { long duration = singleCallDuration(expectedSleep); if (duration > callTimeout) { String msg = "callTimeout=" + callTimeout + ", callDuration=" + duration + - ": " + callable.getExceptionMessageAdditionalDetail(); + ": " + t.getMessage() + " " + callable.getExceptionMessageAdditionalDetail(); throw (SocketTimeoutException)(new SocketTimeoutException(msg).initCause(t)); } } finally {
