Updated Branches: refs/heads/trunk 071c9d471 -> 94dae6609
AMBARI-3242. HBase, Zookeeper and Oozie failed to start when adding services after initial cluster setup. (Vladimir Tkhir via 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/94dae660 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/94dae660 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/94dae660 Branch: refs/heads/trunk Commit: 94dae66098440386c093840bae97692e76771260 Parents: 071c9d4 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Thu Nov 21 12:58:26 2013 -0800 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Thu Nov 21 12:58:26 2013 -0800 ---------------------------------------------------------------------- .../main/puppet/modules/hdp-hbase/manifests/master.pp | 8 ++++++++ .../main/puppet/modules/hdp-oozie/manifests/server.pp | 10 +++++++++- .../puppet/modules/hdp-zookeeper/manifests/service.pp | 12 ++++++++++-- 3 files changed, 27 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/94dae660/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp index c16b1af..0730bcb 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp @@ -44,6 +44,14 @@ class hdp-hbase::master( type => 'master', service_state => $service_state } + + hdp-hadoop::namenode::create_app_directories { 'create_app_directories' : + service_state => $service_state + } + + hdp-hadoop::namenode::create_user_directories { 'create_user_directories' : + service_state => $service_state + } Hdp-hbase::Configfile<||>{hbase_master_hosts => $hdp::params::host_address} http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/94dae660/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp index 5930296..3f39c8d 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp @@ -51,6 +51,14 @@ class hdp-oozie::server( } } + hdp-hadoop::namenode::create_app_directories { 'create_app_directories' : + service_state => $service_state + } + + hdp-hadoop::namenode::create_user_directories { 'create_user_directories' : + service_state => $service_state + } + #installs package, creates user, sets configuration class{ 'hdp-oozie' : service_state => $service_state, @@ -65,7 +73,7 @@ class hdp-oozie::server( } #top level does not need anchors - Class['hdp-oozie'] -> Class['hdp-oozie::service'] + Hdp-Hadoop::Namenode::Create_app_directories['create_app_directories'] -> Hdp-Hadoop::Namenode::Create_user_directories['create_user_directories'] -> Class['hdp-oozie'] -> Class['hdp-oozie::service'] } else { hdp_fail("TODO not implemented yet: service_state = ${service_state}") } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/94dae660/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp index 0456520..2a7799c 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp @@ -69,13 +69,21 @@ class hdp-zookeeper::service( } } + hdp-hadoop::namenode::create_app_directories { 'create_app_directories' : + service_state => $service_state + } + + hdp-hadoop::namenode::create_user_directories { 'create_user_directories' : + service_state => $service_state + } + if ($ensure == 'uninstalled') { anchor{'hdp-zookeeper::service::begin':} -> Hdp::Directory_recursive_create<|context_tag == 'zk_service'|> -> anchor{'hdp-zookeeper::service::end':} } else { class { 'hdp-zookeeper::set_myid': myid => $myid} - anchor{'hdp-zookeeper::service::begin':} -> Hdp::Directory_recursive_create<|context_tag == 'zk_service'|> -> - Class['hdp-zookeeper::set_myid'] -> anchor{'hdp-zookeeper::service::end':} + anchor{'hdp-zookeeper::service::begin':} -> Hdp-hadoop::Namenode::Create_user_directories['create_user_directories'] -> Hdp-hadoop::Namenode::Create_app_directories['create_app_directories'] -> + Hdp::Directory_recursive_create<|context_tag == 'zk_service'|> -> Class['hdp-zookeeper::set_myid'] -> anchor{'hdp-zookeeper::service::end':} if ($daemon_cmd != undef) { Class['hdp-zookeeper::set_myid'] -> Hdp::Exec[$daemon_cmd] -> Anchor['hdp-zookeeper::service::end']
