Author: yusaku
Date: Fri Jan 11 01:04:01 2013
New Revision: 1431772
URL: http://svn.apache.org/viewvc?rev=1431772&view=rev
Log:
AMBARI-1103. Need to be able to reliably recover from the case when the browser
is closed during deploy (Step 8 post submission, Step 9) of the wizard. (Arun
Kandregula via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/routes/installer.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1431772&r1=1431771&r2=1431772&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Jan 11 01:04:01 2013
@@ -458,6 +458,10 @@ AMBARI-666 branch (unreleased changes)
IMPROVEMENTS
+ AMBARI-1103. Need to be able to reliably recover from the case when the
browser
+ is closed during deploy (Step 8 post submission, Step 9) of the wizard.
+ (Arun Kandregula via yusaku)
+
AMBARI-1099. Hive Service Summary needs to show service components better.
(Srimanth Gunturi via yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/routes/installer.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/installer.js?rev=1431772&r1=1431771&r2=1431772&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/installer.js Fri Jan 11
01:04:01 2013
@@ -48,6 +48,13 @@ module.exports = Em.Route.extend({
installerController.setCurrentStep('9');
App.db.data = currentClusterStatus.localdb;
break;
+ case 'CLUSTER_INSTALLED_4' :
+ installerController.setCurrentStep('10');
+ App.db.data = currentClusterStatus.localdb;
+ break;
+ case 'CLUSTER_STARTED_5' :
+ router.transitionTo('main.index');
+ break;
default:
break;
}
@@ -311,6 +318,14 @@ module.exports = Em.Route.extend({
var installerController = router.get('installerController');
var wizardStep9Controller = router.get('wizardStep9Controller');
installerController.saveInstalledHosts(wizardStep9Controller);
+
+ // For recovery : set the cluster status
+ App.clusterStatus.set('value', {
+ clusterName: this.get('clusterName'),
+ clusterState: 'CLUSTER_INSTALLED_4',
+ localdb: App.db.data
+ });
+
router.transitionTo('step10');
}
}),
@@ -329,6 +344,14 @@ module.exports = Em.Route.extend({
if (true) { // this function will be moved to installerController
where it will validate
var controller = router.get('installerController');
controller.finish();
+
+ // For recovery : set the cluster status
+ App.clusterStatus.set('value', {
+ clusterName: this.get('clusterName'),
+ clusterState: 'CLUSTER_STARTED_5',
+ localdb: App.db.data
+ });
+
router.transitionTo('main.index');
} else {
console.log('cluster installation failure');
