Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 713BD200B85 for ; Thu, 15 Sep 2016 16:29:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6FD3E160AC6; Thu, 15 Sep 2016 14:29:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B67CE160ABA for ; Thu, 15 Sep 2016 16:29:09 +0200 (CEST) Received: (qmail 2534 invoked by uid 500); 15 Sep 2016 14:29:08 -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 2525 invoked by uid 99); 15 Sep 2016 14:29:08 -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; Thu, 15 Sep 2016 14:29:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86352E01BD; Thu, 15 Sep 2016 14:29:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: atkach@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18400 Config group other than Default group takes forever to load (atkach) Date: Thu, 15 Sep 2016 14:29:08 +0000 (UTC) archived-at: Thu, 15 Sep 2016 14:29:10 -0000 Repository: ambari Updated Branches: refs/heads/trunk 41a9190fc -> 3c06ca3b6 AMBARI-18400 Config group other than Default group takes forever to load (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3c06ca3b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3c06ca3b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3c06ca3b Branch: refs/heads/trunk Commit: 3c06ca3b654e0abd6fd4265fb16693e1d1f7f97f Parents: 41a9190 Author: Andrii Tkach Authored: Thu Sep 15 15:51:39 2016 +0300 Committer: Andrii Tkach Committed: Thu Sep 15 17:28:59 2016 +0300 ---------------------------------------------------------------------- .../common/configs/config_with_override_recommendation_parser.js | 4 +++- .../configs/config_with_override_recommendation_parser_test.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3c06ca3b/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js index f866451..86ccb65 100644 --- a/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js +++ b/ambari-web/app/mixins/common/configs/config_with_override_recommendation_parser.js @@ -107,10 +107,12 @@ App.ConfigWithOverrideRecommendationParser = Em.Mixin.create(App.ConfigRecommend * @param {Object} stackProperty * @param {string} attr * @param {Number|String|Boolean} value + * @param {String} name + * @param {String} fileName * @param {App.ServiceConfigGroup} configGroup * @protected */ - _updateOverrideBoundaries: function(stackProperty, attr, value, configGroup) { + _updateOverrideBoundaries: function(stackProperty, attr, value, name, fileName, configGroup) { if (!stackProperty.valueAttributes[configGroup.get('name')]) { stackProperty.valueAttributes[configGroup.get('name')] = {}; } http://git-wip-us.apache.org/repos/asf/ambari/blob/3c06ca3b/ambari-web/test/mixins/common/configs/config_with_override_recommendation_parser_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/mixins/common/configs/config_with_override_recommendation_parser_test.js b/ambari-web/test/mixins/common/configs/config_with_override_recommendation_parser_test.js index 5b7b48c..dc92e88 100644 --- a/ambari-web/test/mixins/common/configs/config_with_override_recommendation_parser_test.js +++ b/ambari-web/test/mixins/common/configs/config_with_override_recommendation_parser_test.js @@ -193,12 +193,12 @@ describe('App.ConfigWithOverrideRecommendationParser', function() { }; it("modify attributes on existing group", function() { - mixin._updateOverrideBoundaries(stackProperty, 'attr1', 'false', Em.Object.create({name: 'g1'})); + mixin._updateOverrideBoundaries(stackProperty, 'attr1', 'false', 'n1', 'file1', Em.Object.create({name: 'g1'})); expect(stackProperty.valueAttributes.g1.attr1).to.be.equal('false'); }); it("modify attributes on new group", function() { - mixin._updateOverrideBoundaries(stackProperty, 'attr1', 'true', Em.Object.create({name: 'g2'})); + mixin._updateOverrideBoundaries(stackProperty, 'attr1', 'true', 'n2', 'file1', Em.Object.create({name: 'g2'})); expect(stackProperty.valueAttributes.g2.attr1).to.be.equal('true'); }); });