Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6E32B17221 for ; Fri, 8 May 2015 13:48:41 +0000 (UTC) Received: (qmail 9047 invoked by uid 500); 8 May 2015 13:48:41 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 8986 invoked by uid 500); 8 May 2015 13:48:41 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 8977 invoked by uid 99); 8 May 2015 13:48:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 May 2015 13:48:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BE55DE00D5; Fri, 8 May 2015 13:48:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlowe@apache.org To: common-commits@hadoop.apache.org Message-Id: <95c3c72f9ed34103b012b5ae192cd7f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: 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) Date: Fri, 8 May 2015 13:48:40 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2.7 1fbefe586 -> 1b95bf9e1 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/1b95bf9e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1b95bf9e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1b95bf9e Branch: refs/heads/branch-2.7 Commit: 1b95bf9e1be29f51c7272cfb9f31dda71f2dfae7 Parents: 1fbefe5 Author: Jason Lowe Authored: Fri May 8 13:45:35 2015 +0000 Committer: Jason Lowe Committed: Fri May 8 13:48:21 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/1b95bf9e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 82d4fa6..9bb96d1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -68,6 +68,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/1b95bf9e/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 f6ebb51..d9be06a 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 @@ -1687,7 +1687,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/1b95bf9e/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 @@ Max time to wait to establish a connection to NM yarn.client.nodemanager-connect.max-wait-ms - 900000 + 180000