ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject ambari git commit: AMBARI-17831. Service alerts label is updating with delay (akovalenko)
Date Tue, 13 Sep 2016 12:35:41 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 29b388903 -> dc9889ed6


AMBARI-17831. Service alerts label is updating with delay (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dc9889ed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dc9889ed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dc9889ed

Branch: refs/heads/branch-2.5
Commit: dc9889ed605af7a1582f31d0c0e9bfef21c84b80
Parents: 29b3889
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Thu Jul 21 14:58:30 2016 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Tue Sep 13 15:35:22 2016 +0300

----------------------------------------------------------------------
 .../controllers/global/cluster_controller.js    | 24 +++++++++-----------
 1 file changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/dc9889ed/ambari-web/app/controllers/global/cluster_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js
index 0d9d41d..7a4f63c 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -241,6 +241,17 @@ App.ClusterController = Em.Controller.extend(App.ReloadPopupMixin, {
         //hosts should be loaded after services in order to properly populate host-component
relation in App.cache.services
         updater.updateHost(function () {
           self.set('isHostsLoaded', true);
+          console.time('Overall alerts loading time');
+          updater.updateAlertGroups(function () {
+            updater.updateAlertDefinitions(function () {
+              updater.updateAlertDefinitionSummary(function () {
+                updater.updateUnhealthyAlertInstances(function () {
+                  console.timeEnd('Overall alerts loading time');
+                  self.set('isAlertsLoaded', true);
+                });
+              });
+            });
+          });
         });
         App.config.loadConfigsFromStack(App.Service.find().mapProperty('serviceName')).complete(function
() {
           App.config.loadClusterConfigsFromStack().complete(function () {
@@ -270,19 +281,6 @@ App.ClusterController = Em.Controller.extend(App.ReloadPopupMixin, {
     //force clear filters  for hosts page to load all data
     App.db.setFilterConditions('mainHostController', null);
 
-    // alerts loading doesn't affect overall progress
-    console.time('Overall alerts loading time');
-    updater.updateAlertGroups(function () {
-      updater.updateAlertDefinitions(function () {
-        updater.updateAlertDefinitionSummary(function () {
-          updater.updateUnhealthyAlertInstances(function () {
-            console.timeEnd('Overall alerts loading time');
-            self.set('isAlertsLoaded', true);
-          });
-        });
-      });
-    });
-
     //load cluster-env, used by alert check tolerance // TODO services auto-start
     updater.updateClusterEnv();
 


Mime
View raw message