You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2016/09/15 14:29:08 UTC
ambari git commit: AMBARI-18400 Config group other than Default group
takes forever to load (atkach)
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 <at...@apache.org>
Authored: Thu Sep 15 15:51:39 2016 +0300
Committer: Andrii Tkach <at...@apache.org>
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');
});
});