You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/07 03:04:28 UTC
svn commit: r1347244 - in /incubator/ambari/branches/ambari-186: ./
hmc/php/puppet/ hmc/php/puppet/genmanifest/
hmc/puppet/modules/hdp-ganglia/manifests/
hmc/puppet/modules/hdp-ganglia/manifests/config/
Author: vikram
Date: Thu Jun 7 01:04:27 2012
New Revision: 1347244
URL: http://svn.apache.org/viewvc?rev=1347244&view=rev
Log:
AMBARI-439. Gmetad start fails sometimes. (Contributed by Ramya)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/php/puppet/DBReader.php
incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/PuppetClassDependencies.php
incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/RoleDependencies.php
incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_monitor.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_server.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun 7 01:04:27 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-439. Gmetad start fails sometimes. (Ramya via Vikram)
+
AMBARI-438. Add retry if kick fails immediately. (Jitendra via Vikram)
AMBARI-437. Update router to handle resuming uninstall progress and uninstall failed pages (Yusaku via Vikram)
Modified: incubator/ambari/branches/ambari-186/hmc/php/puppet/DBReader.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/puppet/DBReader.php?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/puppet/DBReader.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/puppet/DBReader.php Thu Jun 7 01:04:27 2012
@@ -131,7 +131,7 @@ class DBReader {
"TEMPLETON_CLIENT" => "hdp-templeton::client",
"DASHBOARD" => "hdp-dashboard",
"NAGIOS_SERVER" => "hdp-nagios::server",
- "GANGLIA_MONITOR_SERVER" => "hdp-ganglia::monitor_and_server",
+ "GANGLIA_MONITOR_SERVER" => "hdp-ganglia::server",
"GANGLIA_MONITOR" => "hdp-ganglia::monitor",
"HTTPD" => "hdp-monitor-webserver"
);
Modified: incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/PuppetClassDependencies.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/PuppetClassDependencies.php?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/PuppetClassDependencies.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/PuppetClassDependencies.php Thu Jun 7 01:04:27 2012
@@ -133,9 +133,8 @@ class PuppetClassDependencies {
//Ganglia
$this->addDependency("hdp-ganglia::monitor", SERVICE_STATE_RUNNING, "hdp-ganglia::hdp-gmond::service_check", array());
- $this->addDependency("hdp-ganglia::monitor_and_server", SERVICE_STATE_RUNNING, "hdp-ganglia::hdp-gmond::service_check", array());
- $this->addDependency("hdp-ganglia::monitor_and_server", SERVICE_STATE_RUNNING, "hdp-ganglia::hdp-gmetad::service_check", array());
- $this->addDependency("hdp-ganglia::monitor_and_server", SERVICE_STATE_RUNNING, "hdp-monitor-webserver", array());
+ $this->addDependency("hdp-ganglia::server", SERVICE_STATE_RUNNING, "hdp-ganglia::hdp-gmetad::service_check", array());
+ $this->addDependency("hdp-ganglia::server", SERVICE_STATE_RUNNING, "hdp-monitor-webserver", array());
//Nagios
$this->addDependency("hdp-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-oozie::client",
Modified: incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/RoleDependencies.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/RoleDependencies.php?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/RoleDependencies.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/RoleDependencies.php Thu Jun 7 01:04:27 2012
@@ -53,7 +53,7 @@
"hdp-dashboard::dashboard::service_check",
"hdp-nagios::server",
"hdp-nagios::nagios::service_check",
- "hdp-ganglia::monitor_and_server",
+ "hdp-ganglia::server",
"hdp-ganglia::monitor",
"hdp-ganglia::hdp-gmond::service_check",
"hdp-ganglia::hdp-gmetad::service_check",
Modified: incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php Thu Jun 7 01:04:27 2012
@@ -224,7 +224,7 @@ include "RoleDependencies.php";
"hdp-templeton::client" => "templeton",
"lzo" => "lzo lzo.i386 lzo-devel lzo-devel.i386",
"snappy" => "snappy snappy-devel",
- "hdp-ganglia::monitor_and_server" => "ganglia-gmetad-3.2.0 ganglia-gmond-3.2.0 gweb hdp_mon_ganglia_addons",
+ "hdp-ganglia::server" => "ganglia-gmetad-3.2.0 ganglia-gmond-3.2.0 gweb hdp_mon_ganglia_addons",
"hdp-ganglia::monitor" => "ganglia-gmond-3.2.0 gweb hdp_mon_ganglia_addons",
"hdp-nagios::server" => "hdp_mon_nagios_addons nagios-3.2.3 nagios-plugins-1.4.9 fping net-snmp-utils",
"hdp-dashboard" => "hdp_mon_dashboard",
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config.pp?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config.pp Thu Jun 7 01:04:27 2012
@@ -3,17 +3,16 @@ class hdp-ganglia::config(
$service_state = $hdp::params::cluster_service_state
)
{
- #TODO: divide into what is needed on server vs what is needed on monitored nodes
- $shell_cmds_dir = $hdp-ganglia::params::ganglia_shell_cmds_dir
- $shell_files = ['checkGmond.sh','checkRrdcached.sh','gmetadLib.sh','gmondLib.sh','rrdcachedLib.sh' ,'setupGanglia.sh','startGmetad.sh','startGmond.sh','startRrdcached.sh','stopGmetad.sh','stopGmond.sh','stopRrdcached.sh','teardownGanglia.sh']
-
- hdp::directory_recursive_create { $shell_cmds_dir :
- owner => root,
- group => root,
- service_state => $service_state,
- force => true
- }
- if ($service_state in ['running','installed_and_configured','stopped']) {
+ if ($service_state in ['running','installed_and_configured','stopped']) {
+ #TODO: divide into what is needed on server vs what is needed on monitored nodes
+ $shell_cmds_dir = $hdp-ganglia::params::ganglia_shell_cmds_dir
+ $shell_files = ['checkGmond.sh','checkRrdcached.sh','gmetadLib.sh','gmondLib.sh','rrdcachedLib.sh' ,'setupGanglia.sh','startGmetad.sh','startGmond.sh','startRrdcached.sh','stopGmetad.sh','stopGmond.sh','stopRrdcached.sh','teardownGanglia.sh']
+
+ hdp::directory_recursive_create { $shell_cmds_dir :
+ owner => root,
+ group => root
+ }
+
hdp-ganglia::config::init_file { ['gmetad','gmond']: }
hdp-ganglia::config::shell_file { $shell_files: }
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_monitor.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_monitor.pp?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_monitor.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_monitor.pp Thu Jun 7 01:04:27 2012
@@ -1,11 +1,16 @@
+#TODO: these scripts called shoudl be converetd to native puppet
define hdp-ganglia::config::generate_monitor(
- $ganglia_service
+ $ganglia_service,
+ $role
)
{
$shell_cmds_dir = $hdp-ganglia::params::ganglia_shell_cmds_dir
-
$cmd = $ganglia_service ? {
- 'gmond' => "${shell_cmds_dir}/setupGanglia.sh -c ${name}",
+ 'gmond' => $role ? {
+ 'server' => "${shell_cmds_dir}/setupGanglia.sh -c ${name} -m",
+ default => "${shell_cmds_dir}/setupGanglia.sh -c ${name}"
+ },
+ 'gmetad' => "${shell_cmds_dir}/setupGanglia.sh -t",
default => hdp_fail("Unexpected ganglia service: ${$ganglia_service}")
}
@@ -13,4 +18,4 @@ define hdp-ganglia::config::generate_mon
hdp::exec { $cmd:
command => $cmd
}
-}
\ No newline at end of file
+}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_server.pp?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_server.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/config/generate_server.pp Thu Jun 7 01:04:27 2012
@@ -1,11 +1,16 @@
+#TODO: these scripts called shoudl be converetd to native puppet
define hdp-ganglia::config::generate_server(
- $ganglia_service
+ $ganglia_service,
+ $role
)
{
$shell_cmds_dir = $hdp-ganglia::params::ganglia_shell_cmds_dir
$cmd = $ganglia_service ? {
- 'gmond' => "${shell_cmds_dir}/setupGanglia.sh -c ${name} -m",
+ 'gmond' => $role ? {
+ 'server' => "${shell_cmds_dir}/setupGanglia.sh -c ${name} -m",
+ default => "${shell_cmds_dir}/setupGanglia.sh -c ${name}"
+ },
'gmetad' => "${shell_cmds_dir}/setupGanglia.sh -t",
default => hdp_fail("Unexpected ganglia service: ${$ganglia_service}")
}
@@ -14,4 +19,4 @@ define hdp-ganglia::config::generate_ser
hdp::exec { $cmd:
command => $cmd
}
-}
\ No newline at end of file
+}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp Thu Jun 7 01:04:27 2012
@@ -2,36 +2,16 @@ class hdp-ganglia(
$service_state
)
{
- if ($service_state != 'no_op') {
+ if (($service_state != 'no_op') or ($service_state != 'uninstalled')) {
include hdp-ganglia::params
$gmetad_user = $hdp-ganglia::params::gmetad_user
$gmond_user = $hdp-ganglia::params::gmond_user
- $ganglia_config_dir = $hdp-ganglia::params::ganglia_shell_cmds_dir
-
- anchor{'hdp-ganglia::begin':}
- if ($service_state == 'uninstalled') {
- hdp::package { 'ganglia-monitor' :
- ensure => 'uninstalled'
- }
- package { 'libganglia' :
- ensure => 'purged'
- }
- Anchor['hdp-ganglia::begin'] -> Hdp::Package['ganglia-monitor'] -> Package['libganglia'] -> Anchor['hdp-ganglia::end']
-
- } elsif ($service_state in ['running','installed_and_configured','stopped']) {
- user { $gmond_user : shell => '/bin/bash'} #provision for nobody user
- if ( $gmetad_user != $gmond_user) {
- user { $gmetad_user : shell => '/bin/bash'} #provision for nobody user
- }
-
- hdp::package { 'ganglia-monitor':
- java_needed => false
- }
-
- Anchor['hdp-ganglia::begin'] -> User<|title == $gmond_user or title == $gmetad_user|> ->
- Hdp::Package['ganglia-monitor'] -> Anchor['hdp-ganglia::end']
+
+ user { $gmond_user : shell => '/bin/bash'} #provision for nobody user
+ if ( $gmetad_user != $gmond_user) {
+ user { $gmetad_user : shell => '/bin/bash'} #provision for nobody user
}
- anchor{'hdp-ganglia::end':}
+ anchor{'hdp-ganglia::begin':} -> User<|title == $gmond_user or title == $gmetad_user|> -> anchor{'hdp-ganglia::end':}
}
}
@@ -49,18 +29,6 @@ class hdp-ganglia::service::gmond(
}
}
-class hdp-ganglia::service::change_permission(
- $ensure
- )
-{
- if ($ensure == 'running' or $ensure == 'installed_and_configured') {
- hdp::directory_recursive_create { '/var/lib/ganglia/dwoo' :
- mode => '0777'
- }
- }
-}
-
-
class hdp-ganglia::service::gmetad(
$ensure
)
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp Thu Jun 7 01:04:27 2012
@@ -4,71 +4,74 @@ class hdp-ganglia::monitor(
$opts = {}
) inherits hdp-ganglia::params
{
+ if ($service_state == 'no_op') {
+ } elsif ($service_state == 'uninstalled') {
- #note: includes the common package ganglia-monitor
- class { 'hdp-ganglia':
- service_state => $service_state
- }
- if ($service_state == 'no_op') {
- } elsif ($service_state in ['uninstalled']) {
- class { 'hdp-ganglia::config':
- ganglia_server_host => $ganglia_server_host,
- service_state => $service_state
+ hdp::package { 'ganglia-monitor':
+ ensure => 'uninstalled',
+ java_needed => false
+ }
+
+ } else {
+ if ($hdp::params::service_exists['hdp-ganglia::server'] != true) {
+ class { 'hdp-ganglia':
+ service_state => $service_state
+ }
}
- } elsif ($service_state in ['running','stopped','installed_and_configured']) {
- #note: includes the common package ganglia-monitor
- class { 'hdp-ganglia::config':
- ganglia_server_host => $ganglia_server_host,
- service_state => $service_state
+
+ hdp::package { 'ganglia-monitor': }
+
+ if ($hdp::params::service_exists['hdp-ganglia::server'] != true) {
+ class { 'hdp-ganglia::config': ganglia_server_host => $ganglia_server_host}
}
- class { 'hdp-ganglia::monitor::config-gen':}
+ if ($hdp::params::component_exists['hdp-hadoop'] == true) {
+ class { 'hdp-hadoop::enable-ganglia': }
+ }
- class { 'hdp-ganglia::service::gmond':
- ensure => $service_state
+ if ($service_exists['hdp-hbase::master'] == true) {
+ class { 'hdp-hbase::master::enable-ganglia': }
+ }
+
+ if ($service_exists['hdp-hbase::regionserver'] == true) {
+ class { 'hdp-hbase::regionserver::enable-ganglia': }
}
- Class['hdp-ganglia'] -> Class['hdp-ganglia::config'] -> Class['hdp-ganglia::monitor::config-gen'] -> Class['hdp-ganglia::service::gmond']
- } else {
- hdp_fail("TODO not implemented yet: service_state = ${service_state}")
+ class { 'hdp-ganglia::monitor::config-gen': }
+
+ class { 'hdp-ganglia::service::gmond': ensure => $service_state}
+
+ 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::service::gmond']
+ } else {
+ Hdp::Package['ganglia-monitor'] -> Class['hdp-ganglia::monitor::config-gen'] -> Class['hdp-ganglia::service::gmond']
+ }
}
}
+
class hdp-ganglia::monitor::config-gen()
{
- anchor{'hdp-ganglia::monitor::config-gen::begin':}
-
- #TODO: to get around anchor problems
- Class['hdp-ganglia'] -> Class['hdp-ganglia::monitor::config-gen']
+ $service_exists = $hdp::params::service_exists
- if ($hdp-ganglia::params::nomit_namenode == true) {
- hdp-ganglia::config::generate_monitor { 'HDPNameNode':
- ganglia_service => 'gmond',
- require => Anchor['hdp-ganglia::monitor::config-gen::begin'],
- before => Anchor['hdp-ganglia::monitor::config-gen::end']
- }
+ if ($service_exists['hdp-hadoop::namenode'] == true) {
+ hdp-ganglia::config::generate_monitor { 'HDPNameNode':}
}
- if ($hdp-ganglia::params::nomit_jobtracker == true) {
- hdp-ganglia::config::generate_monitor { 'HDPJobTracker':
- ganglia_service => 'gmond',
- require => Anchor['hdp-ganglia::monitor::config-gen::begin'],
- before => Anchor['hdp-ganglia::monitor::config-gen::end']
- }
+ if ($service_exists['hdp-hadoop::jobtracker'] == true){
+ hdp-ganglia::config::generate_monitor { 'HDPJobTracker':}
}
- if ($hdp-ganglia::params::nomit_hbase_master == true) {
- hdp-ganglia::config::generate_monitor { 'HDPHBaseMaster':
- ganglia_service => 'gmond',
- require => Anchor['hdp-ganglia::monitor::config-gen::begin'],
- before => Anchor['hdp-ganglia::monitor::config-gen::end']
- }
+ if ($service_exists['hdp-hbase::master'] == true) {
+ hdp-ganglia::config::generate_monitor { 'HDPHBaseMaster':}
}
- if ($hdp-ganglia::params::nomit_slaves == true) {
- hdp-ganglia::config::generate_monitor { 'HDPSlaves':
- ganglia_service => 'gmond',
- require => Anchor['hdp-ganglia::monitor::config-gen::begin'],
- before => Anchor['hdp-ganglia::monitor::config-gen::end']
- }
- }
- anchor{'hdp-ganglia::monitor::config-gen::end':}
+ if ($service_exists['hdp-hadoop::datanode'] == true) {
+ hdp-ganglia::config::generate_monitor { 'HDPSlaves':}
+ }
+ Hdp-ganglia::Config::Generate_monitor<||>{
+ ganglia_service => 'gmond',
+ role => 'monitor'
+ }
+ #
+ anchor{'hdp-ganglia::monitor::config-gen::begin':} -> Hdp-ganglia::Config::Generate_monitor<||> -> anchor{'hdp-ganglia::monitor::config-gen::end':}
}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp Thu Jun 7 01:04:27 2012
@@ -9,10 +9,4 @@ class hdp-ganglia::params() inherits hdp
$gmond_user = $hdp::params::gmond_user
$webserver_group = hdp_default("hadoop/gangliaEnv/webserver_group","apache")
-
-
- $nomit_hbase_master = $hdp::params::service_exists['hdp-hbase::master']
- $nomit_jobtracker = $hdp::params::service_exists['hdp-hadoop::jobtracker']
- $nomit_namenode = $hdp::params::service_exists['hdp-hadoop::namenode']
- $nomit_slaves = $hdp::params::service_exists['hdp-hadoop::datanode']
}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1347244&r1=1347243&r2=1347244&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp Thu Jun 7 01:04:27 2012
@@ -3,129 +3,69 @@ class hdp-ganglia::server(
$opts = {}
) inherits hdp-ganglia::params
{
- $ganglia_shell_cmds_dir = $hdp-ganglia::params::ganglia_shell_cmds_dir
- $ganglia_conf_dir = $hdp-ganglia::params::ganglia_conf_dir
- $ganglia_runtime_dir = $hdp-ganglia::params::ganglia_runtime_dir
-
- #note: includes the common package ganglia-monitor
- class { 'hdp-ganglia':
- service_state => $service_state
- }
+ $hdp::params::service_exists['hdp-ganglia::server'] = true
if ($service_state == 'no_op') {
} elsif ($service_state == 'uninstalled') {
- class { 'hdp-ganglia::server::packages':
+ class { 'hdp-ganglia::server::packages':
ensure => 'uninstalled'
- }
+ }
- hdp::directory { $ganglia_shell_cmds_dir:
- service_state => $service_state,
- force => true
- }
-
- hdp::directory { $ganglia_conf_dir:
- service_state => $service_state,
- force => true
- }
-
- hdp::directory { $ganglia_runtime_dir:
- service_state => $service_state,
- force => true
- }
-
- #top level no anchors needed
- Class['hdp-ganglia'] -> Class['hdp-ganglia::server::packages'] -> Hdp::Directory[$ganglia_shell_cmds_dir] -> Hdp::Directory[$ganglia_conf_dir] -> Hdp::Directory[$ganglia_runtime_dir]
-
- } elsif ($service_state in ['running','stopped','installed_and_configured']) {
-
- class { 'hdp-ganglia::server::packages': }
-
- class { 'hdp-ganglia::config':
- ganglia_server_host => $hdp::params::host_address,
- service_state => $service_state
- }
-
- class {'hdp-ganglia::server::config-gen': }
-
- hdp-ganglia::config::generate_server { 'gmetad':
- ganglia_service => 'gmetad'
- }
-
- class { 'hdp-ganglia::server::services' :
- service_state => $service_state,
- monitor_and_server_single_node => false
- }
-
- #top level no anchors needed
- Class['hdp-ganglia'] -> Class['hdp-ganglia::server::packages'] -> Class['hdp-ganglia::config'] ->
- Class['hdp-ganglia::server::config-gen'] -> Hdp-ganglia::Config::Generate_server['gmetad'] ->
- Class['hdp-ganglia::server::services']
- } else {
- hdp_fail("TODO not implemented yet: service_state = ${service_state}")
+ } else {
+ class { 'hdp-ganglia':
+ service_state => $service_state
+ }
+
+ class { 'hdp-ganglia::server::packages': }
+
+ class { 'hdp-ganglia::config':
+ ganglia_server_host => $hdp::params::host_address,
+ service_state => $service_state
+ }
+
+ hdp-ganglia::config::generate_server { ['HDPHBaseMaster','HDPJobTracker','HDPNameNode','HDPSlaves']:
+ ganglia_service => 'gmond',
+ role => 'server'
+ }
+ hdp-ganglia::config::generate_server { 'gmetad':
+ ganglia_service => 'gmetad',
+ role => 'server'
}
+
+ class { 'hdp-ganglia::server::services' : service_state => $service_state}
+
+ class { 'hdp-ganglia::service::change_permission': ensure => $service_state }
+
+ #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::services'] -> Class['hdp-ganglia::service::change_permission']
+ }
}
class hdp-ganglia::server::packages(
- $ensure = present
+ $ensure = present
)
{
- hdp::package { ['ganglia-server','ganglia-gweb','ganglia-hdp-gweb-addons']:
+ hdp::package { ['ganglia-server','ganglia-gweb','ganglia-hdp-gweb-addons']:
ensure => $ensure,
- java_needed => false
- }
+ java_needed => false
+ }
}
-class hdp-ganglia::server::services(
- $service_state,
- $monitor_and_server_single_node
-)
+class hdp-ganglia::server::services($service_state)
{
- if ($service_state in ['running','stopped']) {
- class { 'hdp-ganglia::service::gmetad': ensure => $service_state}
-
- anchor{'hdp-ganglia::server::services::begin':} -> Class['hdp-ganglia::service::gmetad'] -> anchor{'hdp-ganglia::server::services::end':}
-
- if ($monitor_and_server_single_node == false) {
- class { 'hdp-ganglia::service::gmond': ensure => $service_state}
- class { 'hdp-ganglia::service::change_permission': ensure => $service_state }
-
- Anchor['hdp-ganglia::server::services::begin'] -> Class['hdp-ganglia::service::gmond'] -> Class['hdp-ganglia::service::change_permission'] -> Class['hdp-ganglia::service::gmetad']
- }
- }
+ class { 'hdp-ganglia::service::gmetad': ensure => $service_state}
+ anchor{'hdp-ganglia::server::services::begin':} -> Class['hdp-ganglia::service::gmetad'] -> anchor{'hdp-ganglia::server::services::end':}
}
-class hdp-ganglia::server::config-gen()
+class hdp-ganglia::service::change_permission(
+ $ensure
+)
{
- anchor{'hdp-ganglia::server::config-gen::begin':}
-
- if ($hdp-ganglia::params::nomit_hbase_master == true) {
- hdp-ganglia::config::generate_server { 'HDPHBaseMaster':
- ganglia_service => 'gmond',
- require => Anchor['hdp-ganglia::server::config-gen::begin'],
- before => Anchor['hdp-ganglia::server::config-gen::end']
- }
- }
- if ($hdp-ganglia::params::nomit_jobtracker == true) {
- hdp-ganglia::config::generate_server { 'HDPJobTracker':
- ganglia_service => 'gmond',
- require => Anchor['hdp-ganglia::server::config-gen::begin'],
- before => Anchor['hdp-ganglia::server::config-gen::end']
- }
- }
- if ($hdp-ganglia::params::nomit_namenode == true) {
- hdp-ganglia::config::generate_server { 'HDPNameNode':
- ganglia_service => 'gmond',
- require => Anchor['hdp-ganglia::server::config-gen::begin'],
- before => Anchor['hdp-ganglia::server::config-gen::end']
- }
- }
- if ($hdp-ganglia::params::nomit_slaves == true) {
- hdp-ganglia::config::generate_server { 'HDPSlaves':
- ganglia_service => 'gmond',
- require => Anchor['hdp-ganglia::server::config-gen::begin'],
- before => Anchor['hdp-ganglia::server::config-gen::end']
- }
+ if ($ensure == 'running' or $ensure == 'installed_and_configured') {
+ hdp::directory_recursive_create { '/var/lib/ganglia/dwoo' :
+ mode => '0777'
+ }
}
- anchor{'hdp-ganglia::server::config-gen::end':}
}