Updated Branches: refs/heads/trunk 2f782bd7c -> f06bcd91d
AMBARI-3030. Nodemanager start fails with a puppet error. (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/f06bcd91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f06bcd91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f06bcd91 Branch: refs/heads/trunk Commit: f06bcd91dc75127222e412a003a2dd9181d76dff Parents: 2f782bd Author: Siddharth Wagle <[email protected]> Authored: Mon Aug 26 16:01:30 2013 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Mon Aug 26 16:06:51 2013 -0700 ---------------------------------------------------------------------- .../puppet/modules/hdp-yarn/manifests/nodemanager.pp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f06bcd91/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp index 3bf1eaa..b68a27e 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp @@ -43,11 +43,16 @@ class hdp-yarn::nodemanager( service_state => $service_state } - hdp::directory_recursive_create { $nm_log_dirs: - owner => $yarn_user, - context_tag => 'yarn_service', - service_state => $service_state, - force => true + if ($nm_local_dirs != $nm_log_dirs) { + hdp::directory_recursive_create { $nm_log_dirs: + owner => $yarn_user, + context_tag => 'yarn_service', + service_state => $service_state, + force => true + } + Hdp-yarn::Nodemanager::Create_nm_dirs<||> -> + Hdp::Directory_recursive_create[ $nm_log_dirs ] -> + Hdp-yarn::Service['nodemanager'] } hdp-yarn::service{ 'nodemanager':
