Updated Branches: refs/heads/trunk e6be9e275 -> 7ac4b6cb4
AMBARI-3103. mapreduce.cluster.administrators not being generated for MR2 service. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/7ac4b6cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/7ac4b6cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/7ac4b6cb Branch: refs/heads/trunk Commit: 7ac4b6cb43425f4942f8273d3dcfe77fbbb3cb51 Parents: e6be9e2 Author: Srimanth Gunturi <[email protected]> Authored: Wed Sep 4 17:47:46 2013 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Wed Sep 4 17:50:27 2013 -0700 ---------------------------------------------------------------------- .../MAPREDUCE2/configuration/mapred-site.xml | 8 +++ .../MAPREDUCE2/configuration/mapred-site.xml | 8 +++ .../app/views/common/configs/services_config.js | 63 ++++++++++++-------- 3 files changed, 55 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7ac4b6cb/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml index fad359e..2921a95 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml @@ -56,6 +56,14 @@ <!-- map/reduce properties --> <property> + <name>mapreduce.cluster.administrators</name> + <value> hadoop</value> + <description> + Administrators for MapReduce applications. + </description> + </property> + + <property> <name>mapreduce.reduce.shuffle.parallelcopies</name> <value>30</value> <description> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7ac4b6cb/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml index 2f77361..3844558 100644 --- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml @@ -56,6 +56,14 @@ <!-- map/reduce properties --> <property> + <name>mapreduce.cluster.administrators</name> + <value> hadoop</value> + <description> + Administrators for MapReduce applications. + </description> + </property> + + <property> <name>mapreduce.reduce.shuffle.parallelcopies</name> <value>30</value> <description> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7ac4b6cb/ambari-web/app/views/common/configs/services_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js index 38c14ca..88387c5 100644 --- a/ambari-web/app/views/common/configs/services_config.js +++ b/ambari-web/app/views/common/configs/services_config.js @@ -159,31 +159,46 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({ return; } if(this.get("controller.selectedServiceNames").indexOf("MAPREDUCE") >= 0) { - curConfigs = stepConfigs.findProperty("serviceName", "MAPREDUCE").get("configs"); - if (newValue != curConfigs.findProperty("name", "mapreduce.tasktracker.group").get("value")) { - this.affectedProperties.push( - { - serviceName: "MAPREDUCE", - propertyName: "mapreduce.tasktracker.group", - propertyDisplayName: "mapreduce.tasktracker.group", - newValue: newValue, - curValue: curConfigs.findProperty("name", "mapreduce.tasktracker.group").get("value"), - changedPropertyName: "user_group" - } - ) - } - if ($.trim(newValue) != $.trim(curConfigs.findProperty("name", "mapreduce.cluster.administrators").get("value"))) { - this.affectedProperties.push( - { - serviceName: "MAPREDUCE", - propertyName: "mapreduce.cluster.administrators", - propertyDisplayName: "mapreduce.cluster.administrators", - newValue: " " + $.trim(newValue), - curValue: curConfigs.findProperty("name", "mapreduce.cluster.administrators").get("value"), - changedPropertyName: "user_group" - } - ); + curConfigs = stepConfigs.findProperty("serviceName", "MAPREDUCE").get("configs"); + if (newValue != curConfigs.findProperty("name", "mapreduce.tasktracker.group").get("value")) { + this.affectedProperties.push( + { + serviceName: "MAPREDUCE", + propertyName: "mapreduce.tasktracker.group", + propertyDisplayName: "mapreduce.tasktracker.group", + newValue: newValue, + curValue: curConfigs.findProperty("name", "mapreduce.tasktracker.group").get("value"), + changedPropertyName: "user_group" + } + ) + } + if ($.trim(newValue) != $.trim(curConfigs.findProperty("name", "mapreduce.cluster.administrators").get("value"))) { + this.affectedProperties.push( + { + serviceName: "MAPREDUCE", + propertyName: "mapreduce.cluster.administrators", + propertyDisplayName: "mapreduce.cluster.administrators", + newValue: " " + $.trim(newValue), + curValue: curConfigs.findProperty("name", "mapreduce.cluster.administrators").get("value"), + changedPropertyName: "user_group" + } + ); + } } + if(this.get("controller.selectedServiceNames").indexOf("MAPREDUCE2") >= 0) { + curConfigs = stepConfigs.findProperty("serviceName", "MAPREDUCE2").get("configs"); + if ($.trim(newValue) != $.trim(curConfigs.findProperty("name", "mapreduce.cluster.administrators").get("value"))) { + this.affectedProperties.push( + { + serviceName: "MAPREDUCE2", + propertyName: "mapreduce.cluster.administrators", + propertyDisplayName: "mapreduce.cluster.administrators", + newValue: " " + $.trim(newValue), + curValue: curConfigs.findProperty("name", "mapreduce.cluster.administrators").get("value"), + changedPropertyName: "user_group" + } + ); + } } if (this.get("controller.selectedServiceNames").indexOf("YARN") >= 0) { curConfigs = stepConfigs.findProperty("serviceName", "YARN").get("configs");
