Updated Branches: refs/heads/trunk 18b14d784 -> aa2df114b
AMBARI-3645. HA cluster: some dashboard's widgets contain 'Null', 'NaN' values after services stop. (xiwang) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/aa2df114 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/aa2df114 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/aa2df114 Branch: refs/heads/trunk Commit: aa2df114bf56f04bf00d1310845cf24c21907e62 Parents: 18b14d7 Author: Xi Wang <[email protected]> Authored: Thu Oct 31 14:48:52 2013 -0700 Committer: Xi Wang <[email protected]> Committed: Thu Oct 31 14:48:52 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/views/main/dashboard/service/hbase.js | 4 ++-- .../views/main/dashboard/widgets/hbase_average_load.js | 2 +- .../views/main/dashboard/widgets/node_managers_live.js | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/aa2df114/ambari-web/app/views/main/dashboard/service/hbase.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/service/hbase.js b/ambari-web/app/views/main/dashboard/service/hbase.js index 92f2ab5..28778a5 100644 --- a/ambari-web/app/views/main/dashboard/service/hbase.js +++ b/ambari-web/app/views/main/dashboard/service/hbase.js @@ -96,7 +96,7 @@ App.MainDashboardServiceHbaseView = App.MainDashboardServiceView.extend({ summaryHeader: function () { var avgLoad = this.get('service.averageLoad'); - if (avgLoad == null) { + if (isNaN(avgLoad)) { avgLoad = this.t("services.service.summary.unknown"); } return this.t("dashboard.services.hbase.summary").format(this.get('service.regionServers.length'), avgLoad); @@ -110,7 +110,7 @@ App.MainDashboardServiceHbaseView = App.MainDashboardServiceView.extend({ averageLoad: function () { var avgLoad = this.get('service.averageLoad'); - if (avgLoad == null) { + if (isNaN(avgLoad)) { avgLoad = this.t('services.service.summary.notAvailable'); } return this.t('dashboard.services.hbase.averageLoadPerServer').format(avgLoad); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/aa2df114/ambari-web/app/views/main/dashboard/widgets/hbase_average_load.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets/hbase_average_load.js b/ambari-web/app/views/main/dashboard/widgets/hbase_average_load.js index b02c420..c00994e 100644 --- a/ambari-web/app/views/main/dashboard/widgets/hbase_average_load.js +++ b/ambari-web/app/views/main/dashboard/widgets/hbase_average_load.js @@ -26,7 +26,7 @@ App.HBaseAverageLoadView = App.TextDashboardWidgetView.extend({ model_type: 'hbase', hiddenInfo: function () { var avgLoad = this.get('model.averageLoad'); - if (avgLoad == null) { + if (isNaN(avgLoad)) { avgLoad = Em.I18n.t('services.service.summary.notAvailable'); } var result = []; http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/aa2df114/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js b/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js index ef24cf7..8c933f3 100644 --- a/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js +++ b/ambari-web/app/views/main/dashboard/widgets/node_managers_live.js @@ -26,11 +26,11 @@ App.NodeManagersLiveView = App.TextDashboardWidgetView.extend({ model_type: 'yarn', hiddenInfo: function () { - var nmActive = this.get('model.nodeManagersCountActive'); - var nmLost = this.get('model.nodeManagersCountLost'); - var nmUnhealthy = this.get('model.nodeManagersCountUnhealthy'); - var nmRebooted = this.get('model.nodeManagersCountRebooted'); - var nmDecom = this.get('model.nodeManagersCountDecommissioned'); + var nmActive = this.get('model.nodeManagersCountActive') == null ? Em.I18n.t('services.service.summary.notAvailable') : this.get('model.nodeManagersCountActive'); + var nmLost = this.get('model.nodeManagersCountLost') == null ? Em.I18n.t('services.service.summary.notAvailable') : this.get('model.nodeManagersCountLost'); + var nmUnhealthy = this.get('model.nodeManagersCountUnhealthy') == null ? Em.I18n.t('services.service.summary.notAvailable') : this.get('model.nodeManagersCountUnhealthy'); + var nmRebooted = this.get('model.nodeManagersCountRebooted') == null ? Em.I18n.t('services.service.summary.notAvailable'): this.get('model.nodeManagersCountRebooted'); + var nmDecom = this.get('model.nodeManagersCountDecommissioned') == null ? Em.I18n.t('services.service.summary.notAvailable') : this.get('model.nodeManagersCountDecommissioned'); var result = []; result.pushObject(nmActive + " active"); result.pushObject(nmLost + " lost");
