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 01:24:37 UTC
svn commit: r1347209 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp
hmc/puppet/modules/hdp-ganglia/manifests/params.pp
hmc/puppet/modules/hdp-ganglia/manifests/server.pp
Author: vikram
Date: Wed Jun 6 23:24:36 2012
New Revision: 1347209
URL: http://svn.apache.org/viewvc?rev=1347209&view=rev
Log:
AMBARI-408. HDPJobTracker cluster in ganglia has multiple nodes (Contributed by Suhas)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
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=1347209&r1=1347208&r2=1347209&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Wed Jun 6 23:24:36 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-408. HDPJobTracker cluster in ganglia has multiple nodes (Suhas via Vikram)
+
AMBARI-426. Reinstall of cluster after failure to install results in failure (Ramya via Vikram)
AMBARI-427. Class not found Class['hdp-zookeeper::service'] during uninstall (Ramya via Vikram)
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=1347209&r1=1347208&r2=1347209&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 Wed Jun 6 23:24:36 2012
@@ -40,28 +40,28 @@ class hdp-ganglia::monitor::config-gen()
#TODO: to get around anchor problems
Class['hdp-ganglia'] -> Class['hdp-ganglia::monitor::config-gen']
- if ($hdp-ganglia::params::omit_namenode != true) {
+ 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 ($hdp-ganglia::params::omit_jobtracker != true) {
+ 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 ($hdp-ganglia::params::omit_hbase_master != true) {
+ 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 ($hdp-ganglia::params::omit_slaves != true) {
+ if ($hdp-ganglia::params::nomit_slaves == true) {
hdp-ganglia::config::generate_monitor { 'HDPSlaves':
ganglia_service => 'gmond',
require => Anchor['hdp-ganglia::monitor::config-gen::begin'],
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=1347209&r1=1347208&r2=1347209&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 Wed Jun 6 23:24:36 2012
@@ -11,8 +11,8 @@ class hdp-ganglia::params() inherits hdp
$webserver_group = hdp_default("hadoop/gangliaEnv/webserver_group","apache")
- $omit_hbase_master = hdp_default("omit_hbase_master",hdp_is_empty($hdp::params::hbase_master_host))
- $omit_jobtracker = hdp_default("omit_jobtracker",hdp_is_empty($hdp::params::jtnode_host))
- $omit_namenode = hdp_default("omit_namenode",hdp_is_empty($hdp::params::namenode_host))
- $omit_slaves = hdp_default("omit_slaves",hdp_is_empty($hdp::params::slave_hosts))
+ $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=1347209&r1=1347208&r2=1347209&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 Wed Jun 6 23:24:36 2012
@@ -94,28 +94,28 @@ class hdp-ganglia::server::config-gen()
{
anchor{'hdp-ganglia::server::config-gen::begin':}
- if ($hdp-ganglia::params::omit_hbase_master != true) {
+ 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::omit_jobtracker != true) {
+ 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::omit_namenode != true) {
+ 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::omit_slaves != true) {
+ if ($hdp-ganglia::params::nomit_slaves == true) {
hdp-ganglia::config::generate_server { 'HDPSlaves':
ganglia_service => 'gmond',
require => Anchor['hdp-ganglia::server::config-gen::begin'],