Author: yusaku
Date: Sat Jan 19 01:01:24 2013
New Revision: 1435434
URL: http://svn.apache.org/viewvc?rev=1435434&view=rev
Log:
AMBARI-1214. In any starts fails, "warn" the host and the overall install.
(yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1435434&r1=1435433&r2=1435434&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Jan 19 01:01:24 2013
@@ -17,6 +17,9 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1214. In any starts fails, "warn" the host and the overall install.
+ (yusaku)
+
AMBARI-1204. Install Wizard: Re-enable configuration of user/group names for
master component daemons. (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=1435434&r1=1435433&r2=1435434&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
Sat Jan 19 01:01:24 2013
@@ -35,17 +35,16 @@ App.WizardStep9Controller = Em.Controlle
polledData: [],
status: function () {
- if(this.get('progress') != '100') {
- return 'info';
- }
-
if (this.hosts.someProperty('status', 'failed')) {
return 'failed';
- } else if (this.hosts.someProperty('status', 'warning')) {
+ }
+ if (this.hosts.someProperty('status', 'warning')) {
return 'warning';
}
-
- return 'success';
+ if(this.get('progress') == '100') {
+ return 'success';
+ }
+ return 'info';
}.property('[email protected]', 'progress'),
showRetry: function () {
@@ -442,14 +441,8 @@ App.WizardStep9Controller = Em.Controlle
clusterStatus.installTime = timeToStart;
this.set('status', 'success');
} else {
- if (this.isStepFailed(polledData)) {
clusterStatus.status = 'START FAILED'; // 'START FAILED' implies
to step10 that installation was successful but start failed
- this.set('status', 'failed');
- this.setHostsStatus(this.getFailedHostsForFailedRoles(polledData),
'failed');
- } else {
- clusterStatus.status = 'START FAILED';
this.set('status', 'warning');
- }
}
App.router.get(this.get('content.controllerName')).saveClusterStatus(clusterStatus);
this.set('isStepCompleted', true);
@@ -487,7 +480,7 @@ App.WizardStep9Controller = Em.Controlle
return true;
} else if (this.get('content.cluster.status') === 'START FAILED') {
this.set('progress', '100');
- this.set('status', 'failed');
+ this.set('status', 'warning');
return true;
} else if (this.get('content.cluster.status') === 'STARTED') {
this.set('progress', '100');
