svn commit: r1437206 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/models/host.js

[yusaku]

Author: yusaku
Date: Tue Jan 22 21:56:11 2013
New Revision: 1437206

URL: http://svn.apache.org/viewvc?rev=1437206&view=rev
Log:
AMBARI-1239. Host health status should show orange when there is at least one 
slave component on the host with state!=STARTED. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/models/host.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1437206&r1=1437205&r2=1437206&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Jan 22 21:56:11 2013
@@ -17,6 +17,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1239. Host health status should show orange when there is at least one
+ slave component on the host with state!=STARTED. (yusaku)
+
  AMBARI-1248. Refactoring of update, services and hosts mapper. (yusaku)
 
  AMBARI-1247. Disable links for previous steps in left nav on Summary step.

Modified: incubator/ambari/trunk/ambari-web/app/models/host.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/host.js?rev=1437206&r1=1437205&r2=1437206&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/host.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/host.js Tue Jan 22 21:56:11 
2013
@@ -126,11 +126,13 @@ App.Host = DS.Model.extend({
     if (!this.get('isLoaded') || this.get('isSaving')) {
     } else {
       var status;
-      var masterComponents = 
this.get('hostComponents').filterProperty('isMaster', true);
+      var masterComponents = 
this.get('hostComponents').filterProperty('isMaster');
       var masterComponentsRunning = 
masterComponents.everyProperty('workStatus', App.HostComponentStatus.started);
+      var slaveComponents = 
this.get('hostComponents').filterProperty('isSlave');
+      var slaveComponentsRunning = slaveComponents.everyProperty('workStatus', 
App.HostComponentStatus.started);
       if (this.get('isNotHeartBeating')) {
         status = 'DEAD-YELLOW';
-      } else if (masterComponentsRunning) {
+      } else if (masterComponentsRunning && slaveComponentsRunning) {
         status = 'LIVE';
       } else if (masterComponents.length > 0 && !masterComponentsRunning) {
         status = 'DEAD';