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 00:51:59 UTC
svn commit: r1346642 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/js/uninstallProgress.js hmc/php/db/HMCDBAccessor.php
hmc/php/frontend/uninstallCleanup.php
Author: vikram
Date: Tue Jun 5 22:51:59 2012
New Revision: 1346642
URL: http://svn.apache.org/viewvc?rev=1346642&view=rev
Log:
AMBARI-349.Logging in case of error during uninstall needs to be fixed. (Contributed by Vikram)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/js/uninstallProgress.js
incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php
incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1346642&r1=1346641&r2=1346642&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Tue Jun 5 22:51:59 2012
@@ -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)
Modified: incubator/ambari/branches/ambari-186/hmc/js/uninstallProgress.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/uninstallProgress.js?rev=1346642&r1=1346641&r2=1346642&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/uninstallProgress.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/uninstallProgress.js Tue Jun 5 22:51:59 2012
@@ -165,13 +165,9 @@ function renderUninstallProgress (uninst
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) );
});
Modified: incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php?rev=1346642&r1=1346641&r2=1346642&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php Tue Jun 5 22:51:59 2012
@@ -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);
}
}
Modified: incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php?rev=1346642&r1=1346641&r2=1346642&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php Tue Jun 5 22:51:59 2012
@@ -119,7 +119,7 @@ function deBootStrap ($clusterName, $dep
/////// 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);
}