You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/11/03 20:57:29 UTC
git commit: AMBARI-8123 Node labels need hdfs directory to be created
as part of Ambari YARN install (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 de94405b2 -> 28aebf408
AMBARI-8123 Node labels need hdfs directory to be created as part of Ambari YARN install (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/28aebf40
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/28aebf40
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/28aebf40
Branch: refs/heads/branch-1.7.0
Commit: 28aebf4089a4990b4d46761b4c6202e8903c986c
Parents: de94405
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Nov 3 21:28:22 2014 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Nov 3 21:49:30 2014 +0200
----------------------------------------------------------------------
.../stacks/HDP/2.0.6/services/YARN/package/scripts/params.py | 2 ++
.../2.0.6/services/YARN/package/scripts/resourcemanager.py | 1 -
.../stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py | 7 +++++++
.../stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml | 5 +++++
4 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/28aebf40/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
index e2937ee..5e066d9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
@@ -174,3 +174,5 @@ mapred_local_dir = "/tmp/hadoop-mapred/mapred/local"
hdfs_log_dir_prefix = config['configurations']['hadoop-env']['hdfs_log_dir_prefix']
min_user_id = config['configurations']['yarn-env']['min_user_id']
+# Node labels
+node_labels_dir = default("/configurations/yarn-site/yarn.node-labels.fs-store.root-dir", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/28aebf40/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/resourcemanager.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/resourcemanager.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/resourcemanager.py
index 4d40d68..b87232f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/resourcemanager.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/resourcemanager.py
@@ -29,7 +29,6 @@ from service import service
class Resourcemanager(Script):
def install(self, env):
self.install_packages(env)
- self.configure(env)
def configure(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/28aebf40/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py
index df3a9d2..1333004 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py
@@ -125,6 +125,13 @@ def yarn(name = None):
owner=params.yarn_user,
group=params.user_group
)
+ if params.node_labels_dir:
+ params.HdfsDirectory(params.node_labels_dir,
+ action="create",
+ owner=params.yarn_user,
+ group=params.user_group,
+ mode=0700
+ )
elif name == 'apptimelineserver':
Directory(params.ats_leveldb_dir,
owner=params.yarn_user,
http://git-wip-us.apache.org/repos/asf/ambari/blob/28aebf40/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
index 7bd1e5a..0427cab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
@@ -286,4 +286,9 @@
<value>0.0.0.0</value>
<description>Default value is 0.0.0.0, when this is set the service will bind on all interfaces. I think these two options (blank, "0.0.0.0" sans quotes) should be the two available values, with blank as the default.</description>
</property>
+ <property>
+ <name>yarn.node-labels.fs-store.root-dir</name>
+ <value>/system/yarn/node-labels</value>
+ <description></description>
+ </property>
</configuration>