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 6A5FF10724 for ; Fri, 27 Dec 2013 17:13:34 +0000 (UTC) Received: (qmail 26162 invoked by uid 500); 27 Dec 2013 17:13:34 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 26122 invoked by uid 500); 27 Dec 2013 17:13:34 -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 26109 invoked by uid 99); 27 Dec 2013 17:13:33 -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, 27 Dec 2013 17:13:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 899D281AD78; Fri, 27 Dec 2013 17:13:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alexantonenko@apache.org To: commits@ambari.apache.org Message-Id: <821df44a2fde44aebcdeeada8d3ba511@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-4189. 'DataNode maximum Java heap size' and 'Hadoop maximum Java heap size' overrides for config groups didn't get persisted during installer. (alexantonenko) Date: Fri, 27 Dec 2013 17:13:33 +0000 (UTC) Updated Branches: refs/heads/trunk 8bc7ee984 -> 84ad92a52 AMBARI-4189. 'DataNode maximum Java heap size' and 'Hadoop maximum Java heap size' overrides for config groups didn't get persisted during installer. (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/84ad92a5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84ad92a5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84ad92a5 Branch: refs/heads/trunk Commit: 84ad92a529878af1ee874d4dc8305e0ed7c6b94e Parents: 8bc7ee9 Author: Alex Antonenko Authored: Fri Dec 27 19:08:51 2013 +0200 Committer: Alex Antonenko Committed: Fri Dec 27 19:08:51 2013 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/info/configs.js | 4 +--- ambari-web/app/controllers/wizard/step8_controller.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/84ad92a5/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 2f6a0b1..abc2d72 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -984,7 +984,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ var site = sites.findProperty('type', type); if (site) { site.properties.push({ - isRequiredByAgent: config.get('isRequiredByAgent'), name: config.get('name'), value: config.get('value') }); @@ -993,7 +992,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ type: type, tag: 'version' + time, properties: [{ - isRequiredByAgent: config.get('isRequiredByAgent'), name: config.get('name'), value: config.get('value') }] @@ -1499,7 +1497,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ var globalSiteProperties = {}; globalConfigs.forEach(function (_globalSiteObj) { // do not pass any globalConfigs whose name ends with _host or _hosts - if (_globalSiteObj.isRequiredByAgent === true) { + if (_globalSiteObj.isRequiredByAgent !== false) { // append "m" to JVM memory options except for hadoop_heapsize if (/_heapsize|_newsize|_maxnewsize$/.test(_globalSiteObj.name) && !heapsizeException.contains(_globalSiteObj.name)) { _globalSiteObj.value += "m"; http://git-wip-us.apache.org/repos/asf/ambari/blob/84ad92a5/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index 4abbfc0..c607031 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -1535,7 +1535,7 @@ App.WizardStep8Controller = Em.Controller.extend({ globalSiteObj.forEach(function (_globalSiteObj) { var heapsizeException = ['hadoop_heapsize','yarn_heapsize','nodemanager_heapsize','resourcemanager_heapsize']; // do not pass any globals whose name ends with _host or _hosts - if (_globalSiteObj.isRequiredByAgent === true) { + if (_globalSiteObj.isRequiredByAgent !== false) { // append "m" to JVM memory options except for hadoop_heapsize if (/_heapsize|_newsize|_maxnewsize$/.test(_globalSiteObj.name) && !heapsizeException.contains(_globalSiteObj.name)) { globalSiteProperties[_globalSiteObj.name] = _globalSiteObj.value + "m";