You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/08/18 04:49:25 UTC
git commit: AMBARI-2945. YARN/MR2 components being shown as stopped
with custom pid/log folders. (swagle)
Updated Branches:
refs/heads/trunk f092e2a1c -> 2a9cb5daa
AMBARI-2945. YARN/MR2 components being shown as stopped with custom pid/log folders. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2a9cb5da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2a9cb5da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2a9cb5da
Branch: refs/heads/trunk
Commit: 2a9cb5daaaecb9e52c941ab8d419b89af9c64f17
Parents: f092e2a
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Sat Aug 17 19:22:05 2013 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Sat Aug 17 19:22:05 2013 -0700
----------------------------------------------------------------------
.../main/puppet/modules/hdp-yarn/manifests/params.pp | 14 +++++++-------
.../src/main/python/ambari_agent/AmbariConfig.py | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2a9cb5da/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
index 8916196..f34cf87 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
@@ -31,14 +31,14 @@ class hdp-yarn::params(
$kinit_cmd = "${hdp::params::kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user};"
## yarn-env
- $hadoop_libexec_dir = hdp_default("yarn/yarn-env/hadoop_libexec_dir","/usr/lib/hadoop/libexec")
- $hadoop_yarn_home = hdp_default("yarn/yarn-env/hadoop_yarn_home","/usr/lib/hadoop-yarn")
- $yarn_heapsize = hdp_default("yarn/yarn-env/yarn_heapsize","1024")
- $resourcemanager_heapsize = hdp_default("yarn/yarn-env/resourcemanager_heapsize","1024")
- $nodemanager_heapsize = hdp_default("yarn/yarn-env/nodemanager_heapsize","1024")
+ $hadoop_libexec_dir = $hdp-hadoop::params::hadoop_libexec_dir
+ $hadoop_yarn_home = hdp_default("hadoop_yarn_home","/usr/lib/hadoop-yarn")
+ $yarn_heapsize = hdp_default("yarn_heapsize","1024")
+ $resourcemanager_heapsize = hdp_default("resourcemanager_heapsize","1024")
+ $nodemanager_heapsize = hdp_default("nodemanager_heapsize","1024")
- $yarn_log_dir_prefix = hdp_default("hadoop/yarn-env/yarn_log_dir_prefix","/var/log/hadoop-yarn")
- $yarn_pid_dir_prefix = hdp_default("hadoop/yarn-env/yarn_pid_dir_prefix","/var/run/hadoop-yarn")
+ $yarn_log_dir_prefix = hdp_default("yarn_log_dir_prefix","/var/log/hadoop-yarn")
+ $yarn_pid_dir_prefix = hdp_default("yarn_pid_dir_prefix","/var/run/hadoop-yarn")
## yarn-site
$rm_webui_address = hdp_default("yarn-site/yarn.resourcemanager.webapp.address", "0.0.0.0:8088")
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2a9cb5da/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
index d838d69..332b151 100644
--- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
+++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
@@ -216,7 +216,7 @@ pidPathesVars = [
'defaultValue' : '/var/run/mysqld'},
{'var' : 'webhcat_pid_dir',
'defaultValue' : '/var/run/webhcat'},
- {'var' : 'yarn_pid_dir',
+ {'var' : 'yarn_pid_dir_prefix',
'defaultValue' : '/var/run/hadoop-yarn'},
{'var' : 'mapreduce2_pid_dir',
'defaultValue' : '/var/run/hadoop-mapreduce'},