You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/06/08 15:17:00 UTC
ambari git commit: AMBARI-11786 Configs: yarn is modifying scheduler.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk f3e633ce2 -> 0eeac02e0
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/0eeac02e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0eeac02e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0eeac02e
Branch: refs/heads/trunk
Commit: 0eeac02e0aa545b344eadcb7a0bf9bc40dfbb2b7
Parents: f3e633c
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Jun 8 13:20:14 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Jun 8 16:13:25 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/0eeac02e/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,