You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ta...@apache.org on 2022/04/11 06:24:15 UTC
[hadoop] branch branch-3.3 updated: HADOOP-18191. Log retry count while handling exceptions in RetryInvocationHandler (#4133)
This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new e5516cdfafa HADOOP-18191. Log retry count while handling exceptions in RetryInvocationHandler (#4133)
e5516cdfafa is described below
commit e5516cdfafad421144c65c9afa824dfe78aff5ba
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Fri Apr 8 18:01:54 2022 +0530
HADOOP-18191. Log retry count while handling exceptions in RetryInvocationHandler (#4133)
(cherry picked from commit b69ede7154d44538a4a66824c34f7ba143deef25)
---
.../org/apache/hadoop/io/retry/RetryInvocationHandler.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
index 63e45ed034f..a0cf8b2ee0d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
@@ -387,12 +387,12 @@ public class RetryInvocationHandler<T> implements RpcInvocationHandler {
throw retryInfo.getFailException();
}
- log(method, retryInfo.isFailover(), counters.failovers, retryInfo.delay, e);
+ log(method, retryInfo.isFailover(), counters.failovers, counters.retries, retryInfo.delay, e);
return retryInfo;
}
- private void log(final Method method, final boolean isFailover,
- final int failovers, final long delay, final Exception ex) {
+ private void log(final Method method, final boolean isFailover, final int failovers,
+ final int retries, final long delay, final Exception ex) {
boolean info = true;
// If this is the first failover to this proxy, skip logging at INFO level
if (!failedAtLeastOnce.contains(proxyDescriptor.getProxyInfo().toString()))
@@ -408,13 +408,15 @@ public class RetryInvocationHandler<T> implements RpcInvocationHandler {
}
final StringBuilder b = new StringBuilder()
- .append(ex + ", while invoking ")
+ .append(ex)
+ .append(", while invoking ")
.append(proxyDescriptor.getProxyInfo().getString(method.getName()));
if (failovers > 0) {
b.append(" after ").append(failovers).append(" failover attempts");
}
b.append(isFailover? ". Trying to failover ": ". Retrying ");
b.append(delay > 0? "after sleeping for " + delay + "ms.": "immediately.");
+ b.append(" Current retry count: ").append(retries).append(".");
if (info) {
LOG.info(b.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org