From 59f7789d7d86f8bd8b8ff2f9f72b8e689e48681f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Wed, 27 Feb 2019 15:16:45 +0100 Subject: [PATCH 1/3] HDDS-623. On SCM UI, Node Manager info is empty. Contributed by Elek, Marton. --- .../src/main/resources/webapps/scm/scm-overview.html | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html index de4894ab12ba6..096e1622808db 100644 --- a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html +++ b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html @@ -40,21 +40,9 @@

Status

Block Manager: Open containers {{$ctrl.blockmanagermetrics.OpenContainersNo}} - - Node Manager: Minimum chill mode nodes - {{$ctrl.nodemanagermetrics.MinimumChillModeNodes}} - - - Node Manager: Out-of-node chill mode - {{$ctrl.nodemanagermetrics.OutOfNodeChillMode}} - Node Manager: Chill mode status {{$ctrl.scmmetrics.InChillMode}} - - Node Manager: Manual chill mode - {{$ctrl.nodemanagermetrics.InManualChillMode}} - \ No newline at end of file From dfea41340fc0179d766925581fb44f5fc5b23330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Fri, 1 Mar 2019 17:34:31 +0100 Subject: [PATCH 2/3] remove open container numbers as they are not implemented --- .../src/main/resources/webapps/scm/scm-overview.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html index 096e1622808db..fedfcdfd1fff0 100644 --- a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html +++ b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html @@ -36,13 +36,9 @@

Status

Datanode Rpc port {{$ctrl.overview.jmx.DatanodeRpcPort}} - - Block Manager: Open containers - {{$ctrl.blockmanagermetrics.OpenContainersNo}} - Node Manager: Chill mode status {{$ctrl.scmmetrics.InChillMode}} - \ No newline at end of file + From 0ce232b549fc46219b453c324c78c7454c5b47ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Mon, 4 Mar 2019 15:43:24 +0100 Subject: [PATCH 3/3] remove blockmanagermetrics --- hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js index 7c6dc9132c9b8..2942a561dea32 100644 --- a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js +++ b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js @@ -26,10 +26,6 @@ }, controller: function ($http) { var ctrl = this; - $http.get("jmx?qry=Hadoop:service=BlockManager,name=*") - .then(function (result) { - ctrl.blockmanagermetrics = result.data.beans[0]; - }); $http.get("jmx?qry=Hadoop:service=SCMNodeManager,name=SCMNodeManagerInfo") .then(function (result) { ctrl.nodemanagermetrics = result.data.beans[0];