Repository: ambari Updated Branches: refs/heads/branch-2.2 946714e98 -> f33695e3a
AMBARI-14382 some hdfs metrics do get the data from active nn. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f33695e3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f33695e3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f33695e3 Branch: refs/heads/branch-2.2 Commit: f33695e3a59c342917407a86a5ad277a9ddeeb6c Parents: 946714e Author: Andrii Tkach <[email protected]> Authored: Tue Dec 22 14:22:59 2015 +0200 Committer: Andrii Tkach <[email protected]> Committed: Tue Dec 22 14:22:59 2015 +0200 ---------------------------------------------------------------------- .../stacks/HDP/2.3/services/HDFS/widgets.json | 6 ++++-- .../app/controllers/global/cluster_controller.js | 9 ++++++++- ambari-web/app/views/common/quick_view_link_view.js | 16 +++++++++++++++- 3 files changed, 27 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f33695e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json index e47d431..1010128 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json @@ -304,7 +304,8 @@ "name": "Hadoop:service=NameNode,name=FSNamesystem.CorruptBlocks", "metric_path": "metrics/dfs/FSNamesystem/CorruptBlocks", "service_name": "HDFS", - "component_name": "NAMENODE" + "component_name": "NAMENODE", + "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" } ], "values": [ @@ -328,7 +329,8 @@ "name": "Hadoop:service=NameNode,name=FSNamesystem.UnderReplicatedBlocks", "metric_path": "metrics/dfs/FSNamesystem/UnderReplicatedBlocks", "service_name": "HDFS", - "component_name": "NAMENODE" + "component_name": "NAMENODE", + "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active" } ], "values": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/f33695e3/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 c54db83..fce8011 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -43,6 +43,11 @@ App.ClusterController = Em.Controller.extend({ isServiceMetricsLoaded: false, /** + * @type {boolean} + */ + isHostComponentMetricsLoaded: false, + + /** * Ambari uses custom jdk. * @type {Boolean} */ @@ -241,7 +246,9 @@ App.ClusterController = Em.Controller.extend({ updater.updateServiceMetric(function () { self.set('isServiceMetricsLoaded', true); // make second call, because first is light since it doesn't request host-component metrics - updater.updateServiceMetric(Em.K); + updater.updateServiceMetric(function() { + self.set('isHostComponentMetricsLoaded', true); + }); // components config loading doesn't affect overall progress updater.updateComponentConfig(function () { self.set('isComponentsConfigLoaded', true); http://git-wip-us.apache.org/repos/asf/ambari/blob/f33695e3/ambari-web/app/views/common/quick_view_link_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js index 57f60bc..7825c09 100644 --- a/ambari-web/app/views/common/quick_view_link_view.js +++ b/ambari-web/app/views/common/quick_view_link_view.js @@ -122,11 +122,25 @@ App.QuickViewLinks = Em.View.extend({ return component && component.Hosts.public_host_name; }, + /** + * The flags responsible for data to build quick links: + * - App.router.clusterController.isServiceMetricsLoaded + * + * The flags responsible for correct, up-to-date state of quick links: + * - App.currentStackVersionNumber + * - App.singleNodeInstall + * - App.router.clusterController.isHostComponentMetricsLoaded + */ setQuickLinks: function () { if (App.get('router.clusterController.isServiceMetricsLoaded')) { this.loadTags(); } - }.observes('App.currentStackVersionNumber', 'App.singleNodeInstall', 'App.router.clusterController.isServiceMetricsLoaded'), + }.observes( + 'App.currentStackVersionNumber', + 'App.singleNodeInstall', + 'App.router.clusterController.isServiceMetricsLoaded', + 'App.router.clusterController.isHostComponentMetricsLoaded' + ), setQuickLinksSuccessCallback: function (response) { var self = this;
