Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 82ECE10277 for ; Wed, 13 Nov 2013 00:49:35 +0000 (UTC) Received: (qmail 47735 invoked by uid 500); 13 Nov 2013 00:49:35 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 47713 invoked by uid 500); 13 Nov 2013 00:49:35 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 47699 invoked by uid 99); 13 Nov 2013 00:49:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Nov 2013 00:49:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B52F3823E23; Wed, 13 Nov 2013 00:49:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: srimanth@apache.org To: ambari-commits@incubator.apache.org Date: Wed, 13 Nov 2013 00:49:34 -0000 Message-Id: <900436ae7a00479cad46a50bb057e889@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: AMBARI-3722. Dynamic configs code needs testcases - reverting back to old logic. (srimanth) Updated Branches: refs/heads/trunk a9f5a470a -> f77726510 AMBARI-3722. Dynamic configs code needs testcases - reverting back to old logic. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/f7772651 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f7772651 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f7772651 Branch: refs/heads/trunk Commit: f77726510400c11a06f14d6479b70f5aa078b223 Parents: 7bfddc9 Author: Srimanth Gunturi Authored: Tue Nov 12 14:56:41 2013 -0800 Committer: Srimanth Gunturi Committed: Tue Nov 12 16:48:58 2013 -0800 ---------------------------------------------------------------------- .../configs/defaults_providers/yarn_defaults_provider.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f7772651/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js b/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js index 2622e8d..15b30df 100644 --- a/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js +++ b/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js @@ -69,10 +69,10 @@ App.YARNDefaultsProvider = App.DefaultsProvider.create({ if (!this.clusterDataIsValid()) return null; var ram = this.get('clusterData.ram'); switch(true) { - case (ram < 4): return 256; - case (ram >= 4 && ram < 8): return 512; - case (ram >= 8 && ram < 24): return 1024; - case (ram >= 24): + case (ram <= 4): return 256; + case (ram > 4 && ram <= 8): return 512; + case (ram > 8 && ram <= 24): return 1024; + case (ram > 24): default: return 2048; } }.property('clusterData.ram'),