Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-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 6FB6F1116F for ; Fri, 2 May 2014 23:45:24 +0000 (UTC) Received: (qmail 62203 invoked by uid 500); 2 May 2014 23:45:24 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 62184 invoked by uid 500); 2 May 2014 23:45:23 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 62177 invoked by uid 99); 2 May 2014 23:45:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2014 23:45:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 558D382AAA4; Fri, 2 May 2014 23:45:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swagle@apache.org To: commits@ambari.apache.org Message-Id: <9cd12849bed343cba25e67d1fe991beb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-5661. YARN and MR2 failed to start after upgrade. Default value, if no YARN service. (swagle) Date: Fri, 2 May 2014 23:45:23 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk bb29f54c6 -> 4520a8125 AMBARI-5661. YARN and MR2 failed to start after upgrade. Default value, if no YARN service. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4520a812 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4520a812 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4520a812 Branch: refs/heads/trunk Commit: 4520a81252d807e91bc6f885a88e818b1ebf9e16 Parents: bb29f54 Author: Siddharth Wagle Authored: Fri May 2 16:45:19 2014 -0700 Committer: Siddharth Wagle Committed: Fri May 2 16:45:19 2014 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/services/YARN/package/scripts/params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4520a812/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py index c87135a..065467c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py @@ -105,7 +105,7 @@ yarn_log_aggregation_enabled = config['configurations']['yarn-site']['yarn.log-a yarn_nm_app_log_dir = config['configurations']['yarn-site']['yarn.nodemanager.remote-app-log-dir'] mapreduce_jobhistory_intermediate_done_dir = config['configurations']['mapred-site']['mapreduce.jobhistory.intermediate-done-dir'] mapreduce_jobhistory_done_dir = config['configurations']['mapred-site']['mapreduce.jobhistory.done-dir'] -jobhistory_heapsize = config['configurations']['global']['jobhistory_heapsize'] +jobhistory_heapsize = default("/configurations/global/jobhistory_heapsize", "900") #for create_hdfs_directory hostname = config["hostname"]