Repository: hadoop Updated Branches: refs/heads/HDFS-7240 16dd69ad4 -> bf08dc315
HDFS-12477. Ozone: Some minor text improvement in SCM web UI. Contributed by Elek Marton. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bf08dc31 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bf08dc31 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bf08dc31 Branch: refs/heads/HDFS-7240 Commit: bf08dc315c9071c725622eacc89e0767f150f005 Parents: 16dd69a Author: Weiwei Yang <[email protected]> Authored: Sat Sep 23 22:30:17 2017 +0800 Committer: Weiwei Yang <[email protected]> Committed: Sat Sep 23 22:30:17 2017 +0800 ---------------------------------------------------------------------- .../hadoop-hdfs/src/main/webapps/scm/scm-overview.html | 4 ++-- .../hadoop-hdfs/src/main/webapps/scm/scm.js | 13 +++++++++++++ .../hadoop-hdfs/src/main/webapps/static/ozone.js | 3 ++- 3 files changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf08dc31/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm-overview.html ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm-overview.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm-overview.html index 1c5b976..9342c30 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm-overview.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm-overview.html @@ -18,7 +18,7 @@ <table class="table table-bordered table-striped" class="col-md-6"> <tbody> - <tr ng-repeat="typestat in $ctrl.overview.jmx.NodeCount"> + <tr ng-repeat="typestat in $ctrl.overview.jmx.NodeCount | orderBy:'key':false:$ctrl.nodeOrder"> <td>{{typestat.key}}</td> <td>{{typestat.value}}</td> </tr> @@ -41,7 +41,7 @@ <td>{{$ctrl.blockmanagermetrics.OpenContainersNo}}</td> </tr> <tr> - <td>Node Manager: Minimum chill mode nodes)</td> + <td>Node Manager: Minimum chill mode nodes</td> <td>{{$ctrl.nodemanagermetrics.MinimumChillModeNodes}}</td> </tr> <tr> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf08dc31/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js index 1802fd8..c88fe97 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js @@ -35,6 +35,19 @@ ctrl.nodemanagermetrics = result.data.beans[0]; }); + var statusSortOrder = { + "HEALTHY": "a", + "STALE": "b", + "DEAD": "c", + "UNKNOWN": "z", + "DECOMMISSIONING": "x", + "DECOMMISSIONED": "y" + }; + ctrl.nodeOrder = function (v1, v2) { + //status with non defined sort order will be "undefined" + return ("" + statusSortOrder[v1.value]).localeCompare("" + statusSortOrder[v2.value]) + } + } }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf08dc31/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js index bf30c241..f0d4011 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js @@ -19,7 +19,8 @@ "use strict"; var isIgnoredJmxKeys = function (key) { - return key == 'name' || key == 'modelerType' || key.match(/tag.*/); + return key == 'name' || key == 'modelerType' || key == "$$hashKey" || + key.match(/tag.*/); }; angular.module('ozone', ['nvd3']) angular.module('ozone').component('overview', { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
