AMBARI-4266. multiuser defaults for GlusterFS. (Erin Boyd via mahadev)

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml

@@ -56,7 +56,7 @@
   <property>
     <name>fs.defaultFS</name>
     <!-- cluster variant -->
-    <value></value>
+    <value>glusterfs:///</value>
     <description>The name of the default file system.  Either the
   literal string "local" or a host:port for NDFS.</description>
     <final>true</final>
@@ -65,11 +65,16 @@
   <property>
 <name>fs.default.name</name>
     <!-- cluster variant -->
-    <value></value>
+    <value>glusterfs:///</value>
     <description>The name of the default file system.  Either the
   literal string "local" or a host:port for NDFS.</description>
 </property>
 
+<property>
+<name>gluster.daemon.user</name>
+<value>yarn</value>
+</property>
+
 <property>
 <name>fs.AbstractFileSystem.glusterfs.impl</name>
 <value>org.apache.hadoop.fs.local.GlusterFs</value>

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/MAPREDUCE2/configuration/mapred-site.xml

@@ -194,7 +194,7 @@
 
   <property>
     <name>mapreduce.jobhistory.intermediate-done-dir</name>
-    <value>/mr-history/tmp</value>
+    <value>glusterfs:///mr-history/tmp</value>
     <description>
       Directory where history files are written by MapReduce jobs.
     </description>
@@ -202,7 +202,7 @@
 
   <property>
     <name>mapreduce.jobhistory.done-dir</name>
-    <value>/mr-history/done</value>
+    <value>glusterfs:///mr-history/done</value>
     <description>
       Directory where history files are managed by the MR JobHistory Server.
     </description>
@@ -231,7 +231,7 @@
 
   <property>
     <name>yarn.app.mapreduce.am.staging-dir</name>
-    <value>/user</value>
+    <value>glusterfs:///tmp/hadoop-yarn/staging/mapred/.staging</value>
     <description>
       The staging dir used while submitting jobs.
     </description>

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml

@@ -116,9 +116,17 @@
     </description>
   </property>
 
+  <property>
+    <name>yarn.log.server.url</name>
+    <value>http://localhost:19888/jobhistory/logs</value>
+    <description>
+      URI for the HistoryServer's log resource
+    </description>
+  </property>
+  
   <property>
     <name>yarn.nodemanager.container-executor.class</name>
-    <value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor</value>
+    <value>org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor</value>
     <description>ContainerExecutor for launching containers</description>
   </property>
 

ambari-web/app/controllers/wizard/step8_controller.js

@@ -1663,6 +1663,9 @@ App.WizardStep8Controller = Em.Controller.extend({
       if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.default.name") {
         coreSiteProperties[_coreSiteObj.name] = this.get('globals').someProperty('name', 'fs_glusterfs_default_name') ? App.config.escapeXMLCharacters(this.get('globals').findProperty('name', 'fs_glusterfs_default_name').value) : null;
       }
+      if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.defaultFS") {
+          coreSiteProperties[_coreSiteObj.name] = this.get('globals').someProperty('name', 'glusterfs_defaultFS_name') ? App.config.escapeXMLCharacters(this.get('globals').findProperty('name', 'glusterfs_defaultFS_name').value) : null;
+        }
       console.log("STEP*: name of the property is: " + _coreSiteObj.name);
       console.log("STEP8: value of the property is: " + _coreSiteObj.value);
     }, this);

ambari-web/app/data/HDP2/config_mapping.js

@@ -102,7 +102,14 @@ var configs = [
     "foreignKey": null,
     "value": "<templateName[0]>",
     "filename": "core-site.xml"
-  }
+  },
+  {
+	    "name": "gluster.daemon.user",
+	    "templateName": ["gluster_daemon_user"],
+	    "foreignKey": null,
+	    "value": "<templateName[0]>",
+	    "filename": "core-site.xml"
+	  }
 ];
 
 /**

ambari-web/app/data/HDP2/global_properties.js

@@ -570,6 +570,18 @@ module.exports =
           "serviceName": "GLUSTERFS",
           "category": "General"
         },
+        {
+            "id": "puppet var",
+            "name": "gluster_daemon_user",
+            "displayName": "GlusterFS Daemon user",
+            "description": "GlusterFS Daemon user",
+            "defaultValue": "yarn",
+            "displayType": "string",
+            "isVisible": true,
+            "domain": "global",
+            "serviceName": "GLUSTERFS",
+            "category": "General"
+          },
 
   /**********************************************HIVE***************************************/
     {