Repository: hadoop Updated Branches: refs/heads/branch-2.6.1 342504f79 -> 4fcf71c1e
YARN-3238. Connection timeouts to nodemanagers are retried at multiple levels. Contributed by Jason Lowe (cherry picked from commit 92d67ace3248930c0c0335070cc71a480c566a36) (cherry picked from commit fefeba4ac8bed44ce2dd0d3c4f0a99953ff8d4df) (cherry picked from commit d8f02e1c5c3bcc230d942554b2f4cfbc3ed21526) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4fcf71c1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4fcf71c1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4fcf71c1 Branch: refs/heads/branch-2.6.1 Commit: 4fcf71c1e715dbd4f5933e8114c8bab2050e9d31 Parents: 342504f Author: Xuan <xg...@apache.org> Authored: Sat Feb 21 16:06:12 2015 -0800 Committer: Vinod Kumar Vavilapalli <vino...@apache.org> Committed: Tue Sep 1 11:19:37 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fcf71c1/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5dc5b54..d96a0d9 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -82,6 +82,9 @@ Release 2.6.1 - UNRELEASED YARN-3207. Secondary filter matches entites which do not have the key being filtered for. (Zhijie Shen via xgong) + YARN-3238. Connection timeouts to nodemanagers are retried at + multiple levels (Jason Lowe via xgong) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fcf71c1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java index b6fea62..6024560 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java @@ -72,7 +72,6 @@ public class ServerProxy { exceptionToPolicyMap.put(ConnectException.class, retryPolicy); exceptionToPolicyMap.put(NoRouteToHostException.class, retryPolicy); exceptionToPolicyMap.put(UnknownHostException.class, retryPolicy); - exceptionToPolicyMap.put(ConnectTimeoutException.class, retryPolicy); exceptionToPolicyMap.put(RetriableException.class, retryPolicy); exceptionToPolicyMap.put(SocketException.class, retryPolicy);
