Repository: ambari Updated Branches: refs/heads/branch-2.1 09b2d28e2 -> b1204c98c
AMBARI-11786 Configs: yarn is modifying scheduler. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1204c98 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1204c98 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1204c98 Branch: refs/heads/branch-2.1 Commit: b1204c98c7f208481d16d5120f88d44e5f7ba8b3 Parents: 09b2d28 Author: aBabiichuk <[email protected]> Authored: Mon Jun 8 16:13:25 2015 +0300 Committer: aBabiichuk <[email protected]> Committed: Mon Jun 8 16:17:57 2015 +0300 ---------------------------------------------------------------------- .../app/controllers/main/service/info/configs.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b1204c98/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 e1b8571..59e03ef 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -540,10 +540,22 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM json.items.forEach(function (item) { item.configurations.forEach(function (configuration) { if (serviceName == 'YARN' && configuration.type == 'capacity-scheduler') { + var configsToSkip = this.get('advancedConfigs').filterProperty('filename', 'capacity-scheduler.xml').filterProperty('subSection').mapProperty('name'); // put all properties in a single textarea for capacity-scheduler var value = ''; for (var prop in configuration.properties) { - value += prop + '=' + configuration.properties[prop] + '\n'; + if (configsToSkip.contains(prop)) { + serviceVersionMap[item.service_config_version][prop + '-' + configuration.type] = { + name: prop, + value: configuration.properties[prop], + type: configuration.type, + tag: configuration.tag, + version: configuration.version, + service_config_version: item.service_config_version + }; + } else { + value += prop + '=' + configuration.properties[prop] + '\n'; + } } serviceVersionMap[item.service_config_version][configuration.type + '-' + configuration.type] = { name: configuration.type,
