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/06 23:09:57 UTC

svn commit: r1347131 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/php/puppet/genmanifest/PuppetClassDependencies.php

Author: vikram
Date: Wed Jun  6 21:09:57 2012
New Revision: 1347131

URL: http://svn.apache.org/viewvc?rev=1347131&view=rev
Log:
AMBARI-372. Hive metastore nagios check is broken. (Contributed by Jitendra)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/PuppetClassDependencies.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347131&r1=1347130&r2=1347131&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Wed Jun  6 21:09:57 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-372. Hive metastore nagios check is broken. (Jitendra via Vikram)
+
   AMBARI-373. Create RPM fails as fonts files are not copied over. (Mahadev via Vikram)
 
   AMBARI-371. Mysql packages not being sent during install and uninstall (Jitendra via Vikram)

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=1347131&r1=1347130&r2=1347131&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 Wed Jun  6 21:09:57 2012
@@ -107,13 +107,23 @@ class PuppetClassDependencies {
     $this->addDependency("hdp-ganglia::monitor_and_server", SERVICE_STATE_RUNNING, "hdp-monitor-webserver", array());
 
     //Nagios
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-nagios::nagios::service_check", array());
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-monitor-webserver", array());
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-oozie::client",
+    $this->addDependency("hdp-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-oozie::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
-    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-hcat",
+    $this->addDependency("hdp-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hcat",
+        array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
+    $this->addDependency("hdp-nagios::server", SERVICE_STATE_INSTALLED_AND_CONFIGURED, "hdp-hive::client",
         array("service_state" => SERVICE_STATE_INSTALLED_AND_CONFIGURED));
 
+    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-oozie::client",
+        array("service_state" => SERVICE_STATE_NO_OP));
+    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-hcat",
+        array("service_state" => SERVICE_STATE_NO_OP));
+    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-hive::client",
+        array("service_state" => SERVICE_STATE_NO_OP));
+
+    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-nagios::nagios::service_check", array());
+    $this->addDependency("hdp-nagios::server", SERVICE_STATE_RUNNING, "hdp-monitor-webserver", array());
+
     //Dashboard
     $this->addDependency("hdp-dashboard", SERVICE_STATE_RUNNING, "hdp-dashboard::dashboard::service_check", array());
   }