Browse Source

AMBARI-3103. mapreduce.cluster.administrators not being generated for MR2 service. (srimanth)

Srimanth Gunturi 11 years ago
parent
commit
7ac4b6cb43

+ 8 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml

@@ -55,6 +55,14 @@
   </property>
 
 <!-- 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>

+ 8 - 0
ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/MAPREDUCE2/configuration/mapred-site.xml

@@ -55,6 +55,14 @@
   </property>
 
   <!-- 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>

+ 39 - 24
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");