Repository: hbase Updated Branches: refs/heads/branch-1.3 9b65c7a26 -> f30e95314
Revert "Log the underlying RPC exception in RpcRetryingCallerImpl": missing HBASE-16149 This reverts commit 9b65c7a26d2d200d740d1cb6aed6c5e73e829dc1. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/da8bcabb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/da8bcabb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/da8bcabb Branch: refs/heads/branch-1.3 Commit: da8bcabb99ee5a9a35efd114aa45292616ca3c70 Parents: 9b65c7a Author: Jerry He <jerry...@apache.org> Authored: Fri Jul 1 22:57:43 2016 -0700 Committer: Jerry He <jerry...@apache.org> Committed: Fri Jul 1 22:57:43 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/client/RpcRetryingCaller.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/da8bcabb/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 6f587d1..76261b2 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,17 +139,16 @@ 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=" - + t.getMessage() + " " + callable.getExceptionMessageAdditionalDetail()); + + 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, @@ -167,7 +166,7 @@ public class RpcRetryingCaller<T> { long duration = singleCallDuration(expectedSleep); if (duration > callTimeout) { String msg = "callTimeout=" + callTimeout + ", callDuration=" + duration + - ": " + t.getMessage() + " " + callable.getExceptionMessageAdditionalDetail(); + ": " + callable.getExceptionMessageAdditionalDetail(); throw (SocketTimeoutException)(new SocketTimeoutException(msg).initCause(t)); } } finally {
