Repository: ambari Updated Branches: refs/heads/trunk 9906552a2 -> ba121b523
AMBARI-9291 Alerts: Hosts alerts badge doesn't clear until clicking into hosts. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba121b52 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba121b52 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba121b52 Branch: refs/heads/trunk Commit: ba121b52301e03d263c5f1dbe1c26eb6a1884948 Parents: 9906552 Author: Andrii Tkach <atk...@hortonworks.com> Authored: Fri Jan 23 11:58:51 2015 +0200 Committer: Andrii Tkach <atk...@hortonworks.com> Committed: Fri Jan 23 11:58:51 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/config.js | 1 + ambari-web/app/controllers/global/cluster_controller.js | 1 - ambari-web/app/controllers/main/host.js | 2 +- ambari-web/app/views/main/host.js | 6 ------ 4 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ba121b52/ambari-web/app/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index 978c26b..35d9fd2 100644 --- a/ambari-web/app/config.js +++ b/ambari-web/app/config.js @@ -37,6 +37,7 @@ App.sessionKeepAliveInterval = 60000; App.bgOperationsUpdateInterval = 6000; App.componentsUpdateInterval = 6000; App.contentUpdateInterval = 15000; +App.hostStatusCountersUpdateInterval = 10000; App.alertDefinitionsUpdateInterval = 10000; App.alertInstancesUpdateInterval = 10000; App.alertGroupsUpdateInterval = 10000; http://git-wip-us.apache.org/repos/asf/ambari/blob/ba121b52/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 60760b1..a63a9bf 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -230,7 +230,6 @@ App.ClusterController = Em.Controller.extend({ var hostsController = App.router.get('mainHostController'); hostsController.set('isCountersUpdating', true); hostsController.updateStatusCounters(); - hostsController.set('isCountersUpdating', false); App.HttpClient.get(racksUrl, App.racksMapper, { complete: function (jqXHR, textStatus) { http://git-wip-us.apache.org/repos/asf/ambari/blob/ba121b52/ambari-web/app/controllers/main/host.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host.js b/ambari-web/app/controllers/main/host.js index 166cbfc..100266e 100644 --- a/ambari-web/app/controllers/main/host.js +++ b/ambari-web/app/controllers/main/host.js @@ -299,7 +299,7 @@ App.MainHostController = Em.ArrayController.extend(App.TableServerMixin, { setTimeout(function () { self.updateStatusCounters(); - }, App.get('componentsUpdateInterval')); + }, App.get('hostStatusCountersUpdateInterval')); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/ba121b52/ambari-web/app/views/main/host.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host.js b/ambari-web/app/views/main/host.js index 5153a75..107a2c8 100644 --- a/ambari-web/app/views/main/host.js +++ b/ambari-web/app/views/main/host.js @@ -217,8 +217,6 @@ App.MainHostView = App.TableView.extend(App.TableServerViewMixin, { this.addObserver('controller.clearFilters', this, this.clearFiltersObs); this.clearFiltersObs(); this.addObserver('selectAllHosts', this, this.toggleAllHosts); - this.set('controller.isCountersUpdating', true); - this.get('controller').updateStatusCounters(); this.addObserver('filteringComplete', this, this.overlayObserver); this.addObserver('startIndex', this, 'updatePagination'); this.addObserver('displayLength', this, 'updatePagination'); @@ -232,10 +230,6 @@ App.MainHostView = App.TableView.extend(App.TableServerViewMixin, { } }.observes('tableFilteringComplete'), - willDestroyElement: function() { - this.set('controller.isCountersUpdating', false); - }, - /** * Set <code>selected</code> property for each App.Host */
