ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject git commit: AMBARI-4359. Update GlusterFS defaults. (Erin Boyd via mahadev)
Date Mon, 20 Jan 2014 21:16:09 GMT
Updated Branches:
  refs/heads/branch-1.4.4 b2a8260b3 -> 735f0698b


AMBARI-4359. Update GlusterFS defaults. (Erin Boyd via mahadev)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/735f0698
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/735f0698
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/735f0698

Branch: refs/heads/branch-1.4.4
Commit: 735f0698b61ecaaf696cfbd81867dfc10e7b54dc
Parents: b2a8260
Author: Mahadev Konar <mahadev@apache.org>
Authored: Mon Jan 20 13:16:00 2014 -0800
Committer: Mahadev Konar <mahadev@apache.org>
Committed: Mon Jan 20 13:16:00 2014 -0800

----------------------------------------------------------------------
 .../services/GLUSTERFS/configuration/core-site.xml      |  9 +++++++--
 .../services/MAPREDUCE2/configuration/mapred-site.xml   |  6 +++---
 .../services/YARN/configuration/yarn-site.xml           | 10 +++++++++-
 ambari-web/app/controllers/wizard/step8_controller.js   |  3 +++
 ambari-web/app/data/HDP2/config_mapping.js              | 12 ++++++++++--
 ambari-web/app/data/HDP2/global_properties.js           | 12 ++++++++++++
 6 files changed, 44 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/735f0698/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
index 9b2c954..8c1c103 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
+++ b/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,12 +65,17 @@
   <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>
 </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/735f0698/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/MAPREDUCE2/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/MAPREDUCE2/configuration/mapred-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/MAPREDUCE2/configuration/mapred-site.xml
index 424d216..2a7b297 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/MAPREDUCE2/configuration/mapred-site.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/735f0698/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml
index 4be078a..6d40722 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml
@@ -117,8 +117,16 @@
   </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>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/735f0698/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 3569444..597d813 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1577,6 +1577,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);

http://git-wip-us.apache.org/repos/asf/ambari/blob/735f0698/ambari-web/app/data/HDP2/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/config_mapping.js b/ambari-web/app/data/HDP2/config_mapping.js
index f62162a..33d3eb6 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -97,12 +97,20 @@ var configs = [
     "filename": "core-site.xml"
   },
   {
-        "name": "fs.AbstractFileSystem.glusterfs.impl",
-        "templateName": ["fs_AbstractFileSystem_glusterfs_impl"],
+    "name": "fs.AbstractFileSystem.glusterfs.impl",
+    "templateName": ["fs_AbstractFileSystem_glusterfs_impl"],
     "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"
+  },
+
 /**********************************************hbase-site***************************************/
   {
     "name": "hbase.zookeeper.quorum",

http://git-wip-us.apache.org/repos/asf/ambari/blob/735f0698/ambari-web/app/data/HDP2/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js
index 127eea9..33f3c2a 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/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***************************************/
     {


Mime
View raw message