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 sj...@apache.org on 2015/09/28 19:49:19 UTC
hadoop git commit: YARN-3554. Default value for maximum nodemanager
connect wait time is too high. Contributed by Naganarasimha G R (cherry
picked from commit 9757864fd662b69445e0c600aedbe307a264982e) (cherry picked
from commit 1b95bf9e1be29f51c7272cfb9f
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 4104ab346 -> c4cbbcbc2
YARN-3554. Default value for maximum nodemanager connect wait time is too high. Contributed by Naganarasimha G R
(cherry picked from commit 9757864fd662b69445e0c600aedbe307a264982e)
(cherry picked from commit 1b95bf9e1be29f51c7272cfb9f31dda71f2dfae7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c4cbbcbc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c4cbbcbc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c4cbbcbc
Branch: refs/heads/branch-2.6
Commit: c4cbbcbc26879cd1e643ca8ffe375234d0513e83
Parents: 4104ab3
Author: Jason Lowe <jl...@apache.org>
Authored: Fri May 8 13:45:35 2015 +0000
Committer: Sangjin Lee <sj...@apache.org>
Committed: Mon Sep 28 10:48:40 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 +-
.../hadoop-yarn-common/src/main/resources/yarn-default.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4cbbcbc/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index fdf65bb..5ccffba 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -24,6 +24,9 @@ Release 2.6.2 - UNRELEASED
YARN-4087. Followup fixes after YARN-2019 regarding RM behavior when
state-store error occurs. (Jian He via xgong)
+ YARN-3554. Default value for maximum nodemanager connect wait time is too
+ high (Naganarasimha G R via jlowe)
+
Release 2.6.1 - 2015-09-23
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4cbbcbc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index d7f24ac..ddcd7f6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -1465,7 +1465,7 @@ public class YarnConfiguration extends Configuration {
public static final String CLIENT_NM_CONNECT_MAX_WAIT_MS =
YARN_PREFIX + "client.nodemanager-connect.max-wait-ms";
public static final long DEFAULT_CLIENT_NM_CONNECT_MAX_WAIT_MS =
- 15 * 60 * 1000;
+ 3 * 60 * 1000;
/** Time interval between each attempt to connect to NM */
public static final String CLIENT_NM_CONNECT_RETRY_INTERVAL_MS =
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4cbbcbc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 9b56d99..e794339 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -1127,7 +1127,7 @@
<property>
<description>Max time to wait to establish a connection to NM</description>
<name>yarn.client.nodemanager-connect.max-wait-ms</name>
- <value>900000</value>
+ <value>180000</value>
</property>
<property>