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 2015/10/30 14:51:27 UTC
ambari git commit: AMBARI-13658 Disabling HDFS ranger plugin fails
from Ranger->Ranger plugin fails. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 81d5ccf01 -> 726e684b9
AMBARI-13658 Disabling HDFS ranger plugin fails from Ranger->Ranger plugin fails. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/726e684b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/726e684b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/726e684b
Branch: refs/heads/branch-2.1
Commit: 726e684b969a393e9d279ac4af566dba95ec0fba
Parents: 81d5ccf
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Fri Oct 30 15:07:30 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Fri Oct 30 15:50:01 2015 +0200
----------------------------------------------------------------------
ambari-web/app/mixins/common/configs/configs_saver.js | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/726e684b/ambari-web/app/mixins/common/configs/configs_saver.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/configs_saver.js b/ambari-web/app/mixins/common/configs/configs_saver.js
index 311164e..2344044 100644
--- a/ambari-web/app/mixins/common/configs/configs_saver.js
+++ b/ambari-web/app/mixins/common/configs/configs_saver.js
@@ -296,11 +296,12 @@ App.ConfigsSaverMixin = Em.Mixin.create({
if (serviceName === 'YARN') {
configs = App.config.textareaIntoFileConfigs(configs, 'capacity-scheduler.xml');
}
- /**
- * generates list of properties that was changed
- * @type {Array}
- */
+
+ //generates list of properties that was changed
var modifiedConfigs = this.getModifiedConfigs(configs);
+ var serviceFilenames = Object.keys(App.StackService.find(serviceName).get('configTypes')).map(function (type) {
+ return App.config.getOriginalFileName(type);
+ });
// save modified original configs that have no group
modifiedConfigs = this.saveSiteConfigs(modifiedConfigs.filter(function (config) {
@@ -309,7 +310,9 @@ App.ConfigsSaverMixin = Em.Mixin.create({
if (!Em.isArray(modifiedConfigs) || modifiedConfigs.length == 0) return null;
- var fileNamesToSave = modifiedConfigs.mapProperty('filename').concat(this.get('modifiedFileNames')).uniq();
+ var fileNamesToSave = modifiedConfigs.mapProperty('filename').concat(this.get('modifiedFileNames')).filter(function(filename) {
+ return serviceFilenames.contains(filename);
+ }).uniq();
var configsToSave = this.generateDesiredConfigsJSON(modifiedConfigs, fileNamesToSave, this.get('serviceConfigVersionNote'));