Browse Source

AMBARI-1300.  Service status / host component status can get stuck in the green blinking state if stop fails - no further operation can be performed. (srimanth via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1440738 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 12 years ago
parent
commit
fda26d78ff
2 changed files with 14 additions and 10 deletions
  1. 6 1
      CHANGES.txt
  2. 8 9
      ambari-web/app/mappers/server_data_mapper.js

+ 6 - 1
CHANGES.txt

@@ -186,10 +186,15 @@ Trunk (unreleased changes):
  AMBARI-1270. Add predicate objects for checking empty resource category.
  (tbeerbower)
 
- AMBARI - 1286. Set version number property in gsInstaller cluster resource provider. (tbeerbower)
+ AMBARI - 1286. Set version number property in gsInstaller cluster resource
+ provider. (tbeerbower)
 
  BUG FIXES
 
+ AMBARI-1300.  Service status / host component status can get stuck in the
+ green blinking state if stop fails - no further operation can be performed.
+ (srimanth via yusaku) 
+
  AMBARI-1297. Edit User: if "old password" is not specified and "new
  password" is specified, password update silently fails. (Jaimin Jetly via
  yusaku)

+ 8 - 9
ambari-web/app/mappers/server_data_mapper.js

@@ -114,15 +114,14 @@ App.QuickDataMapper = App.ServerDataMapper.extend({
   },
 
   calculateState: function (json) {
-    var stateEqual = (json.desired_status != json.work_status);
-    if (stateEqual) {
-      if (json.desired_status == 'STARTED' && json.work_status == 'INSTALLED') {
-        json.work_status = 'STARTING';
-      } else if (json.desired_status == 'INSTALLED' && json.work_status == 'STARTED') {
-        json.work_status = 'STOPPING';
-      }
-    }
-
+//    var stateEqual = (json.desired_status != json.work_status);
+//    if (stateEqual) {
+//      if (json.desired_status == 'STARTED' && json.work_status == 'INSTALLED') {
+//        json.work_status = 'STARTING';
+//      } else if (json.desired_status == 'INSTALLED' && json.work_status == 'STARTED') {
+//        json.work_status = 'STOPPING';
+//      }
+//    }
     return json;
   }
 });