svn commit: r1347280 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/db/schema.dump hmc/php/orchestrator/Cluster.php

[vi...@apache.org]

Author: vikram
Date: Thu Jun  7 01:45:04 2012
New Revision: 1347280

URL: http://svn.apache.org/viewvc?rev=1347280&view=rev
Log:
AMBARI-461. Uninstall shoud stop nagios service first before stopping other services (Contributed by Hitesh)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/db/schema.dump
    incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347280&r1=1347279&r2=1347280&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun  7 01:45:04 2012
@@ -5,6 +5,8 @@ should be listed by their full name. Ple
 characters wide.
 
 Release 0.1.x - unreleased
+
+  AMBARI-461. Uninstall shoud stop nagios service first before stopping other services (Hitesh via Vikram)
   
   AMBARI-464. Auto refresh should be applicable to all the service tabs (Suhas via Vikram)
 

Modified: incubator/ambari/branches/ambari-186/hmc/db/schema.dump
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/db/schema.dump?rev=1347280&r1=1347279&r2=1347280&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/db/schema.dump (original)
+++ incubator/ambari/branches/ambari-186/hmc/db/schema.dump Thu Jun  7 01:45:04 2012
@@ -51,10 +51,10 @@ INSERT OR REPLACE INTO "Services" ( serv
 INSERT OR REPLACE INTO "Services" ( service_name, display_name, attributes, description ) VALUES
   ( "DASHBOARD", "Dashboard", '{ "runnable": true, "mustInstall": true, "editable": false, "noDisplay": true }',  "Monitoring Dashboard for HDP" );
 INSERT OR REPLACE INTO "Services" ( service_name, display_name, attributes, description ) VALUES
-  ( "NAGIOS", "Nagios", '{ "runnable": true, "mustInstall": true, "editable": false, "noDisplay": false }',  "Nagios-based Monitoring for HDP" );
-INSERT OR REPLACE INTO "Services" ( service_name, display_name, attributes, description ) VALUES
   ( "GANGLIA", "Ganglia", '{ "runnable": true, "mustInstall": true, "editable": false, "noDisplay": false }',  "Ganglia-based Metrics Collection for HDP" );
 INSERT OR REPLACE INTO "Services" ( service_name, display_name, attributes, description ) VALUES
+  ( "NAGIOS", "Nagios", '{ "runnable": true, "mustInstall": true, "editable": false, "noDisplay": false }',  "Nagios-based Monitoring for HDP" );
+INSERT OR REPLACE INTO "Services" ( service_name, display_name, attributes, description ) VALUES
   ( "MISCELLANEOUS", "Miscellaneous", '{ "runnable": false, "mustInstall": true, "editable": false, "noDisplay": true }',  "" );
 
 CREATE TABLE  "ServiceComponents" (

Modified: incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php?rev=1347280&r1=1347279&r2=1347280&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php Thu Jun  7 01:45:04 2012
@@ -183,6 +183,11 @@ class Cluster {
       $this->logger->log_error("Failed to get cluster services.");
       return array("result" => -1, "error" => "Failed to get cluster services from DB.");
     }
+
+    // reverse order of services
+    // should cause NAGIOS to stop first
+    $services = array_reverse($services);
+
     $this->logger->log_info("Uninstalling HDP.... DryRun=$dryRun");
     $result = $this->_stopAllServices($services,
         $transaction->createSubTransaction(), $dryRun);