incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1469123 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard/step9_controller.js ambari-web/app/routes/add_service_routes.js
Date Thu, 18 Apr 2013 01:39:47 GMT
Author: yusaku
Date: Thu Apr 18 01:39:47 2013
New Revision: 1469123

URL: http://svn.apache.org/r1469123
Log:
AMBARI-1956. Wrong install status shown in Add Service Wizard. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
    incubator/ambari/trunk/ambari-web/app/routes/add_service_routes.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1469123&r1=1469122&r2=1469123&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 18 01:39:47 2013
@@ -747,6 +747,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1956. Wrong install status shown in Add Service Wizard. (yusaku)
+
  AMBARI-1951. Ambari agent setup during bootstrap should install the same
  version of agent as the server. (smohanty)
 

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=1469123&r1=1469122&r2=1469123&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 Thu Apr 18
01:39:47 2013
@@ -399,10 +399,22 @@ App.WizardStep9Controller = Em.Controlle
     if (actions.someProperty('Tasks.status', 'FAILED') || actions.someProperty('Tasks.status',
'ABORTED') || actions.someProperty('Tasks.status', 'TIMEDOUT')) {
       contentHost.set('status', 'warning');
     }
-    if (this.get('content.cluster.status') === 'PENDING' && actions.someProperty('Tasks.status',
'FAILED')) {
+    if ((this.get('content.cluster.status') === 'PENDING' && actions.someProperty('Tasks.status',
'FAILED')) || (this.isMasterFailed(actions))) {
       contentHost.set('status', 'failed');
     }
   },
+  //return true if there is at least one FAILED task of master component install
+  isMasterFailed: function(polledData) {
+    var result = false;
+    polledData.filterProperty('Tasks.command', 'INSTALL').filterProperty('Tasks.status',
'FAILED').mapProperty('Tasks.role').forEach (
+      function (task) {
+        if (!['DATANODE', 'TASKTRACKER', 'HBASE_REGIONSERVER', 'GANGLIA_MONITOR'].contains(task))
{
+          result = true;
+        }
+      }
+    );
+    return result;
+  },
 
   onInProgressPerHost: function (tasks, contentHost) {
     var runningAction = tasks.findProperty('Tasks.status', 'IN_PROGRESS');

Modified: incubator/ambari/trunk/ambari-web/app/routes/add_service_routes.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/add_service_routes.js?rev=1469123&r1=1469122&r2=1469123&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/add_service_routes.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/add_service_routes.js Thu Apr 18 01:39:47
2013
@@ -248,6 +248,7 @@ module.exports = Em.Route.extend({
           var isRetry = true;
           addServiceController.installServices(isRetry);
           addServiceController.setInfoForStep9();
+          wizardStep9Controller.resetHostsForRetry();
           // We need to do recovery based on whether we are in Add Host or Installer wizard
           addServiceController.saveClusterState('ADD_SERVICES_INSTALLING_3');
         }



Mime
View raw message