Author: yusaku
Date: Fri Jan 11 02:24:18 2013
New Revision: 1431817
URL: http://svn.apache.org/viewvc?rev=1431817&view=rev
Log:
AMBARI-1140. Resuming deploy for Installer/Add Hosts does not work if the
browser is shut down during the start phase of deploy. (Arun Kandregula via
yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
incubator/ambari/trunk/ambari-web/app/models/cluster_states.js
incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js
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=1431817&r1=1431816&r2=1431817&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Jan 11 02:24:18 2013
@@ -674,6 +674,10 @@ AMBARI-666 branch (unreleased changes)
OPTIMIZATIONS
BUG FIXES
+
+ AMBARI-1140. Resuming deploy for Installer/Add Hosts does not work if the
+ browser is shut down during the start phase of deploy.
+ (Arun Kandregula via yusaku)
AMBARI-1120. Key spikes in HDFS IO missing from IO summary graphs.
(Srimanth Gunturi via yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js?rev=1431817&r1=1431816&r2=1431817&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
Fri Jan 11 02:24:18 2013
@@ -277,6 +277,13 @@ App.WizardStep9Controller = Em.Controlle
};
App.router.get(self.get('content.controllerName')).saveClusterStatus(clusterStatus);
+
+ // We need to do recovery if there is a browser crash
+ App.clusterStatus.set('value', {
+ clusterState: 'SERVICE_STARTING_3',
+ localdb: App.db.data
+ });
+
self.startPolling();
},
Modified: incubator/ambari/trunk/ambari-web/app/models/cluster_states.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/cluster_states.js?rev=1431817&r1=1431816&r2=1431817&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/cluster_states.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/cluster_states.js Fri Jan 11
02:24:18 2013
@@ -19,7 +19,7 @@ var App = require('app');
App.clusterStatus = Ember.Object.create({
clusterName: '',
- validStates: ['CLUSTER_NOT_CREATED_1', 'CLUSTER_DEPLOY_PREP_2',
'CLUSTER_INSTALLING_3', 'CLUSTER_INSTALLED_4', 'CLUSTER_STARTED_5',
'ADD_HOSTS_DEPLOY_PREP_2', 'ADD_HOSTS_INSTALLING_3', 'ADD_HOSTS_INSTALLED_4',
'ADD_HOSTS_COMPLETED_5'],
+ validStates: ['CLUSTER_NOT_CREATED_1', 'CLUSTER_DEPLOY_PREP_2',
'CLUSTER_INSTALLING_3', 'SERVICE_STARTING_3', 'CLUSTER_INSTALLED_4',
'CLUSTER_STARTED_5', 'ADD_HOSTS_DEPLOY_PREP_2', 'ADD_HOSTS_INSTALLING_3',
'ADD_HOSTS_INSTALLED_4', 'ADD_HOSTS_COMPLETED_5'],
clusterState: 'CLUSTER_NOT_CREATED_1',
wizardControllerName: null,
localdb: null,
Modified: incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js?rev=1431817&r1=1431816&r2=1431817&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js Fri Jan 11
02:24:18 2013
@@ -56,6 +56,7 @@ module.exports = Em.Route.extend({
App.db.data = currentClusterStatus.localdb;
break;
case 'ADD_HOSTS_INSTALLING_3' :
+ case 'SERVICE_STARTING_3' :
addHostController.setCurrentStep('5');
App.db.data = currentClusterStatus.localdb;
break;
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=1431817&r1=1431816&r2=1431817&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/installer.js Fri Jan 11
02:24:18 2013
@@ -45,6 +45,7 @@ module.exports = Em.Route.extend({
App.db.data = currentClusterStatus.localdb;
break;
case 'CLUSTER_INSTALLING_3' :
+ case 'SERVICE_STARTING_3' :
installerController.setCurrentStep('9');
App.db.data = currentClusterStatus.localdb;
break;
