You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by je...@apache.org on 2016/07/02 05:48:58 UTC
hbase git commit: Revert "Log the underlying RPC exception in
RpcRetryingCallerImpl": missing HBASE-16149
Repository: hbase
Updated Branches:
refs/heads/branch-1 f18ac8157 -> 4d7e5992c
Revert "Log the underlying RPC exception in RpcRetryingCallerImpl": missing HBASE-16149
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4d7e5992
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4d7e5992
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4d7e5992
Branch: refs/heads/branch-1
Commit: 4d7e5992cfe949e7aa8c1326ce247011af14a6fd
Parents: f18ac81
Author: Jerry He <je...@apache.org>
Authored: Fri Jul 1 22:47:51 2016 -0700
Committer: Jerry He <je...@apache.org>
Committed: Fri Jul 1 22:47:51 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/4d7e5992/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 {