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 ju...@apache.org on 2017/02/08 10:10:11 UTC
hadoop git commit: YARN-6145. Improve log message on fail over.
Contributed by Jian He.
Repository: hadoop
Updated Branches:
refs/heads/trunk 2007e0cf2 -> eec52e158
YARN-6145. Improve log message on fail over. Contributed by Jian He.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eec52e15
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eec52e15
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eec52e15
Branch: refs/heads/trunk
Commit: eec52e158b7bc14b2d3d53512323ba05e15e09e3
Parents: 2007e0c
Author: Junping Du <ju...@apache.org>
Authored: Wed Feb 8 02:11:19 2017 -0800
Committer: Junping Du <ju...@apache.org>
Committed: Wed Feb 8 02:11:19 2017 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/io/retry/RetryInvocationHandler.java | 8 +++++---
.../src/main/java/org/apache/hadoop/ipc/Client.java | 6 ++++--
.../yarn/client/RequestHedgingRMFailoverProxyProvider.java | 6 ++++--
3 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/eec52e15/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
----------------------------------------------------------------------
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 c657d20..8487602 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
@@ -130,7 +130,9 @@ public class RetryInvocationHandler<T> implements RpcInvocationHandler {
Thread.sleep(retryInfo.delay);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- LOG.warn("Interrupted while waiting to retry", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Interrupted while waiting to retry", e);
+ }
InterruptedIOException intIOE = new InterruptedIOException(
"Retry interrupted");
intIOE.initCause(e);
@@ -375,7 +377,7 @@ public class RetryInvocationHandler<T> implements RpcInvocationHandler {
}
final StringBuilder b = new StringBuilder()
- .append("Exception while invoking ")
+ .append(ex + ", while invoking ")
.append(proxyDescriptor.getProxyInfo().getString(method.getName()));
if (failovers > 0) {
b.append(" after ").append(failovers).append(" failover attempts");
@@ -384,7 +386,7 @@ public class RetryInvocationHandler<T> implements RpcInvocationHandler {
b.append(delay > 0? "after sleeping for " + delay + "ms.": "immediately.");
if (info) {
- LOG.info(b.toString(), ex);
+ LOG.info(b.toString());
} else {
LOG.debug(b.toString(), ex);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/eec52e15/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
index 94f1945..70b902c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
@@ -910,8 +910,10 @@ public class Client implements AutoCloseable {
}
if (action.action == RetryAction.RetryDecision.FAIL) {
if (action.reason != null) {
- LOG.warn("Failed to connect to server: " + server + ": "
- + action.reason, ioe);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Failed to connect to server: " + server + ": "
+ + action.reason, ioe);
+ }
}
throw ioe;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/eec52e15/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
index 9468f4e..13c02af 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
@@ -144,6 +144,8 @@ public class RequestHedgingRMFailoverProxyProvider<T>
args);
}
+ LOG.info("Looking for the active RM in " + Arrays.toString(rmServiceIds)
+ + "...");
ExecutorService executor = null;
CompletionService<Object> completionService;
try {
@@ -166,7 +168,7 @@ public class RequestHedgingRMFailoverProxyProvider<T>
Object retVal;
try {
retVal = callResultFuture.get();
- LOG.info("Invocation successful on [" + pInfo + "]");
+ LOG.info("Found active RM [" + pInfo + "]");
return retVal;
} catch (Exception ex) {
// Throw exception from first responding RM so that clients can handle
@@ -192,7 +194,7 @@ public class RequestHedgingRMFailoverProxyProvider<T>
@Override
public void performFailover(T currentProxy) {
- LOG.info("Connection lost, trying to fail over.");
+ LOG.info("Connection lost with " + successfulProxy + ", trying to fail over.");
successfulProxy = null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org