You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/01/15 20:04:58 UTC
git commit: AMBARI-4266. multiuser defaults for GlusterFS. (Erin Boyd
via mahadev)
Updated Branches:
refs/heads/trunk 15c39f4bc -> fa78cd71a
AMBARI-4266. multiuser defaults for GlusterFS. (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/fa78cd71
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa78cd71
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa78cd71
Branch: refs/heads/trunk
Commit: fa78cd71a3d425eb597894862924913a6809f055
Parents: 15c39f4
Author: Mahadev Konar <ma...@apache.org>
Authored: Wed Jan 15 10:56:52 2014 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Wed Jan 15 10:56:52 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 | 9 ++++++++-
ambari-web/app/data/HDP2/global_properties.js | 12 ++++++++++++
6 files changed, 42 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa78cd71/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/fa78cd71/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/fa78cd71/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/fa78cd71/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 e689705..8bad6d4 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/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);
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa78cd71/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 85156b1..fa1d6a4 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/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"
+ }
];
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa78cd71/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 427da9d..8276a1a 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***************************************/
{