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 jl...@apache.org on 2015/05/08 15:48:05 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)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 faf26f081 -> bcb863b15
YARN-3554. Default value for maximum nodemanager connect wait time is too high. Contributed by Naganarasimha G R
(cherry picked from commit 9757864fd662b69445e0c600aedbe307a264982e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bcb863b1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bcb863b1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bcb863b1
Branch: refs/heads/branch-2
Commit: bcb863b1569a3765fe0b408966e0349eb5dfe5b8
Parents: faf26f0
Author: Jason Lowe <jl...@apache.org>
Authored: Fri May 8 13:45:35 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Fri May 8 13:47:48 2015 +0000
----------------------------------------------------------------------
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/bcb863b1/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 056de96..594ec71 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -365,6 +365,9 @@ Release 2.7.1 - UNRELEASED
YARN-3358. Audit log not present while refreshing Service ACLs.
(Varun Saxena via devaraj)
+ YARN-3554. Default value for maximum nodemanager connect wait time is too
+ high (Naganarasimha G R via jlowe)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bcb863b1/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 9780ae5..9c1db17 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
@@ -1809,7 +1809,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/bcb863b1/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 66400c8..5d0f07d 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
@@ -1138,7 +1138,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>