Author: swagle
Date: Wed May 29 19:59:21 2013
New Revision: 1487621
URL: http://svn.apache.org/r1487621
Log:
AMBARI-2222. Analyze puppet scripts for potential dependency issues. (swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487621&r1=1487620&r2=1487621&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 29 19:59:21 2013
@@ -904,6 +904,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2222. Analyze puppet scripts for potential dependency issues. (swagle)
+
AMBARI-2221. Simplify JDBC driver setup process. (swagle)
AMBARI-2220. Update deployed log4j conf for Hbase deployments from Ambari.
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/init.pp?rev=1487621&r1=1487620&r2=1487621&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/init.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/init.pp
Wed May 29 19:59:21 2013
@@ -22,7 +22,7 @@ class hdp-ganglia(
$service_state
)
{
- if (($service_state != 'no_op') or ($service_state != 'uninstalled')) {
+ if ! ($service_state in ['no_op', 'uninstalled']) {
include hdp-ganglia::params
$gmetad_user = $hdp-ganglia::params::gmetad_user
$gmond_user = $hdp-ganglia::params::gmond_user
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp?rev=1487621&r1=1487620&r2=1487621&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
Wed May 29 19:59:21 2013
@@ -65,9 +65,11 @@ class hdp-ganglia::monitor(
if ($hdp::params::service_exists['hdp-ganglia::server'] != true) {
Class['hdp-ganglia'] -> Hdp::Package['ganglia-monitor'] ->
Class['hdp-ganglia::config'] ->
- Class['hdp-ganglia::monitor::config-gen'] ->
Class['hdp-ganglia::monitor::gmond'] -> Class['hdp-ganglia::monitor::ownership']
+ Class['hdp-ganglia::monitor::config-gen'] ->
Class['hdp-ganglia::monitor::ownership'] ->
+ Class['hdp-ganglia::monitor::gmond']
} else {
- Hdp::Package['ganglia-monitor'] ->
Class['hdp-ganglia::monitor::config-gen'] ->
Class['hdp-ganglia::monitor::gmond'] -> Class['hdp-ganglia::monitor::ownership']
+ Hdp::Package['ganglia-monitor'] ->
Class['hdp-ganglia::monitor::config-gen'] ->
+ Class['hdp-ganglia::monitor::ownership'] ->
Class['hdp-ganglia::monitor::gmond']
}
}
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1487621&r1=1487620&r2=1487621&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
Wed May 29 19:59:21 2013
@@ -95,8 +95,9 @@ class hdp-ganglia::server(
#top level does not need anchors
Class['hdp-ganglia'] -> Class['hdp-ganglia::server::packages'] ->
Class['hdp-ganglia::config'] ->
- Hdp-ganglia::Config::Generate_server<||> ->
- Class['hdp-ganglia::server::gmetad'] ->
File["${hdp-ganglia::params::ganglia_dir}/gmetad.conf"] ->
Class['hdp-ganglia::service::change_permission'] ->
Class['hdp-ganglia::server::files'] -> Class['hdp-monitor-webserver']
+ Hdp-ganglia::Config::Generate_server<||> ->
+ File["${hdp-ganglia::params::ganglia_dir}/gmetad.conf"] ->
Class['hdp-ganglia::service::change_permission'] ->
+ Class['hdp-ganglia::server::files'] ->
Class['hdp-ganglia::server::gmetad'] -> Class['hdp-monitor-webserver']
}
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp?rev=1487621&r1=1487620&r2=1487621&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
Wed May 29 19:59:21 2013
@@ -276,10 +276,9 @@ class hdp-hadoop(
owner => $hdfs_user,
}
- Anchor['hdp-hadoop::begin'] -> Hdp-hadoop::Package<||> ->
Hdp::User<|title == $hdfs_user or title == $mapred_user|> ->
Hdp::Directory_recursive_create[$hadoop_config_dir]
- -> Hdp-hadoop::Configfile<|tag == 'common'|> -> Anchor['hdp-hadoop::end']
- Anchor['hdp-hadoop::begin'] ->
Hdp::Directory_recursive_create[$logdirprefix] -> Anchor['hdp-hadoop::end']
- Anchor['hdp-hadoop::begin'] ->
Hdp::Directory_recursive_create[$piddirprefix] -> Anchor['hdp-hadoop::end']
+ Anchor['hdp-hadoop::begin'] -> Hdp-hadoop::Package<||> ->
Hdp::User<|title == $hdfs_user or title == $mapred_user|> ->
+ Hdp::Directory_recursive_create[$hadoop_config_dir] ->
Hdp-hadoop::Configfile<|tag == 'common'|> ->
+ Hdp::Directory_recursive_create[$logdirprefix] ->
Hdp::Directory_recursive_create[$piddirprefix] -> Anchor['hdp-hadoop::end']
}
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp?rev=1487621&r1=1487620&r2=1487621&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
Wed May 29 19:59:21 2013
@@ -90,13 +90,13 @@ class hdp-hadoop::namenode(
}
#top level does not need anchors
- Class['hdp-hadoop'] -> Hdp-hadoop::Service['namenode']
- Hdp-hadoop::Namenode::Create_name_dirs<||> ->
Hdp-hadoop::Service['namenode']
- Hdp-hadoop::Service['namenode'] ->
Hdp-hadoop::Namenode::Create_app_directories<||> ->
Hdp-hadoop::Namenode::Create_user_directories<||>
+ Class['hdp-hadoop'] -> Hdp-hadoop::Namenode::Create_name_dirs<||> ->
Hdp-hadoop::Service['namenode'] ->
+ # Now, creating directories inside HDFS
+ Hdp-hadoop::Namenode::Create_app_directories<||> ->
Hdp-hadoop::Namenode::Create_user_directories<||>
if ($service_state == 'running' and $format == true) {
- Class['hdp-hadoop'] -> Class['hdp-hadoop::namenode::format'] ->
Hdp-hadoop::Service['namenode']
- Hdp-hadoop::Namenode::Create_name_dirs<||> ->
Class['hdp-hadoop::namenode::format']
- }
+ Class['hdp-hadoop'] -> Hdp-hadoop::Namenode::Create_name_dirs<||> ->
+ Class['hdp-hadoop::namenode::format'] ->
Hdp-hadoop::Service['namenode']
+ }
} else {
hdp_fail("TODO not implemented yet: service_state = ${service_state}")
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp?rev=1487621&r1=1487620&r2=1487621&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
Wed May 29 19:59:21 2013
@@ -79,8 +79,8 @@ class hdp-hadoop::snamenode(
}
#top level does not need anchors
- Class['hdp-hadoop'] -> Hdp-hadoop::Service['secondarynamenode']
- Hdp-hadoop::Namenode::Create_name_dirs<||> ->
Hdp-hadoop::Service['secondarynamenode']
+ Class['hdp-hadoop'] -> Hdp-hadoop::Namenode::Create_name_dirs<||> ->
+ Hdp-hadoop::Service['secondarynamenode']
} else {
hdp_fail("TODO not implemented yet: service_state = ${service_state}")
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp?rev=1487621&r1=1487620&r2=1487621&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
Wed May 29 19:59:21 2013
@@ -73,8 +73,7 @@ class hdp-hadoop::tasktracker(
}
#top level does not need anchors
- Class['hdp-hadoop'] -> Hdp-hadoop::Service['tasktracker']
- Hdp-hadoop::Tasktracker::Create_local_dirs<||> ->
Hdp-hadoop::Service['tasktracker']
+ Class['hdp-hadoop'] -> Hdp-hadoop::Tasktracker::Create_local_dirs<||> ->
Hdp-hadoop::Service['tasktracker']
} else {
hdp_fail("TODO not implemented yet: service_state = ${service_state}")
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp?rev=1487621&r1=1487620&r2=1487621&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
Wed May 29 19:59:21 2013
@@ -98,7 +98,8 @@ define hdp-yarn::service(
anchor{"hdp-yarn::service::${name}::begin":}
anchor{"hdp-yarn::service::${name}::end":}
if ($daemon_cmd != undef) {
- Anchor["hdp-yarn::service::${name}::begin"] -> Hdp::Exec[$daemon_cmd] ->
Anchor["hdp-yarn::service::${name}::end"]
+ Anchor["hdp-yarn::service::${name}::begin"] ->
Hdp::Directory_recursive_create<|context_tag == 'yarn_service'|> ->
+ Hdp::Exec[$daemon_cmd] -> Anchor["hdp-yarn::service::${name}::end"]
}
if ($ensure == 'running') {
