incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1487193 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard/step14_controller.js
Date Wed, 29 May 2013 01:58:38 GMT
Author: yusaku
Date: Wed May 29 01:58:38 2013
New Revision: 1487193

URL: http://svn.apache.org/r1487193
Log:
AMBARI-2205. Reassign Master Wizard: Installing master with TIMEDOUT should not be completed.
(yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487193&r1=1487192&r2=1487193&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 29 01:58:38 2013
@@ -894,6 +894,9 @@ Trunk (unreleased changes):
  Farrellee via mahadev)
 
  BUG FIXES
+
+ AMBARI-2205.  Reassign Master Wizard: Installing master with TIMEDOUT should
+ not be completed. (yusaku)
  
  AMBARI-2204.  Reassign Master Wizard: Review Config shouldn't show unchanged
  values. (yusaku)

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js?rev=1487193&r1=1487192&r2=1487193&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js Wed May
29 01:58:38 2013
@@ -752,10 +752,10 @@ App.WizardStep14Controller = Em.Controll
       task = 0;
     }
     if (!polledData.someProperty('Tasks.status', 'PENDING') && !polledData.someProperty('Tasks.status',
'QUEUED') && !polledData.someProperty('Tasks.status', 'IN_PROGRESS')) {
-      if (polledData.someProperty('Tasks.status', 'FAILED')) {
-        this.setTasksStatus(task, 'FAILED');
-      } else {
+      if (polledData.everyProperty('Tasks.status', 'COMPLETED')) {
         this.setTasksStatus(task, 'COMPLETED');
+      } else {
+        this.setTasksStatus(task, 'FAILED');
       }
       stopPolling = true;
     } else {



Mime
View raw message