AMBARI-349.Logging in case of error during uninstall needs to be fixed. (Contributed by Vikram)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1346642 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-349. Logging in case of error during uninstall needs to be fixed. (Vikram)
+
   AMBARI-317. Select-all + unselect HBASE removes Zookeeper incorrectly (Vinod via Vikram)
 
   AMBARI-348. Select all services by default (Vinod via Vikram)

hmc/js/uninstallProgress.js

@@ -165,13 +165,9 @@ function renderUninstallProgress (uninstallProgressInfo) {
 
           globalYui.one('#txnProgressStatusActionsDivId').setContent(  
             '<a href="javascript:void(null)" id=clustersListLinkId>' + 
-              'Go Manage The Cluster\'s Services' +
+              'Restart the installation wizard' + 
             '</a>' );
 
-          globalYui.one("#restartInstallationWizardLinkId").on( "click", function(e) {
-            window.open( window.location.href );
-          });
-
           globalYui.one("#clustersListLinkId").on( "click", function(e) {
             window.open( generateClustersListUrl(txnProgressWidget.txnProgressContext.clusterName) );
           });

hmc/php/db/HMCDBAccessor.php

@@ -3277,14 +3277,14 @@ class HMCDBAccessor {
   }
 
   public function cleanupCluster ($clusterName) {
-    $this->deleteClusterTable($clusterName, "SubTransactionStatus");
-    $this->deleteClusterTable($clusterName, "TransactionStatus");
+    $this->deleteClusterTable($clusterName, "Clusters");
+    $this->deleteClusterTable($clusterName, "ServiceComponentInfo");
     $this->cleanupHosts($clusterName);
   }
 
   public function deleteCluster ($clusterName) {
-    $this->deleteClusterTable($clusterName, "Clusters");
-    $this->deleteClusterTable($clusterName, "ServiceComponentInfo");
+    $this->deleteClusterTable($clusterName, "SubTransactionStatus");
+    $this->deleteClusterTable($clusterName, "TransactionStatus");
     $this->cleanupCluster($clusterName);
   }
 }

hmc/php/frontend/uninstallCleanup.php

@@ -119,7 +119,7 @@ function deBootStrap ($clusterName, $deployUser, $txnId, $progressInfo)
   /////// done monitoring return back to the uninstall
   
   // need to cleanup db for this cluster
-  $dbAccessor->deleteCluster($clusterName);
+  $dbAccessor->cleanupCluster($clusterName);
   
   return array('result' => $result, 'error' => $error);
 }