Repository: hadoop Updated Branches: refs/heads/branch-3.1 4be0fa28d -> 5d50f716e
HDFS-13466. RBF: Add more router-related information to the UI. (cherry picked from commit e4313e7e4725261b652dd7202048ff2373b05e28) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5d50f716 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5d50f716 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5d50f716 Branch: refs/heads/branch-3.1 Commit: 5d50f716e7f6a51b391700c0b66c6b42c7d38b63 Parents: 4be0fa2 Author: Wei Yan <[email protected]> Authored: Tue Apr 17 15:01:07 2018 -0700 Committer: Wei Yan <[email protected]> Committed: Tue Apr 17 15:03:12 2018 -0700 ---------------------------------------------------------------------- .../src/main/webapps/router/federationhealth.html | 17 +++++++++++++++-- .../src/main/webapps/router/federationhealth.js | 5 ++++- 2 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d50f716/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html index a7da094..f1cf482 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html @@ -90,6 +90,21 @@ <div class="page-header"><h1>Summary</h1></div> {#federation} +<p> + Security is {#routerstat}{#SecurityEnabled}on{:else}off{/SecurityEnabled}{/routerstat}.</p> +<p>{#router}{#Safemode}{.}{:else}Safemode is off.{/Safemode}{/router}</p> + +<p> + {NumFiles|fmt_number} files and directories, {NumBlocks|fmt_number} blocks. +</p> + +{#mem.HeapMemoryUsage} +<p>Heap Memory used {used|fmt_bytes} of {committed|fmt_bytes} Heap Memory. Max Heap Memory is {@eq key=max value="-1" type="number"}<unbounded>{:else}{max|fmt_bytes}{/eq}.</p> +{/mem.HeapMemoryUsage} + +{#mem.NonHeapMemoryUsage} +<p>Non Heap Memory used {used|fmt_bytes} of {committed|fmt_bytes} Commited Non Heap Memory. Max Non Heap Memory is {@eq key=max value="-1" type="number"}<unbounded>{:else}{max|fmt_bytes}{/eq}.</p> +{/mem.NonHeapMemoryUsage} <table class="table table-bordered table-striped"> <tr><th>Total capacity</th><td>{TotalCapacity|fmt_bytes}</td></tr> <tr><th>Used capacity</th><td>{UsedCapacity|fmt_bytes}</td></tr> @@ -103,8 +118,6 @@ <tr><th><a href="#tab-datanode">Live Nodes</a></th><td>{NumLiveNodes} (Decommissioned: {NumDecomLiveNodes})</td></tr> <tr><th><a href="#tab-datanode">Dead Nodes</a></th><td>{NumDeadNodes} (Decommissioned: {NumDecomDeadNodes})</td></tr> <tr><th><a href="#tab-datanode">Decommissioning Nodes</a></th><td>{NumDecommissioningNodes}</td></tr> - <tr><th>Files</th><td>{NumFiles}</td></tr> - <tr><th>Blocks</th><td>{NumBlocks}</td></tr> <tr><th title="Excludes missing blocks.">Number of Under-Replicated Blocks</th><td>{NumOfBlocksUnderReplicated}</td></tr> <tr><th>Number of Blocks Pending Deletion</th><td>{NumOfBlocksPendingDeletion}</td></tr> </table> http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d50f716/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js index ef0a2a4..a0b0128 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js @@ -33,7 +33,10 @@ function load_overview() { var BEANS = [ - {"name": "federation", "url": "/jmx?qry=Hadoop:service=Router,name=FederationState"} + {"name": "federation", "url": "/jmx?qry=Hadoop:service=Router,name=FederationState"}, + {"name": "routerstat", "url": "/jmx?qry=Hadoop:service=NameNode,name=NameNodeStatus"}, + {"name": "router", "url": "/jmx?qrt=Hadoop:service=NameNode,name=NameNodeInfo"}, + {"name": "mem", "url": "/jmx?qry=java.lang:type=Memory"} ]; var HELPERS = { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
