From 4e712faac2065ee6b843c03e67f9e9773df405cd Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Mon, 17 Aug 2015 11:04:00 -0700 Subject: [PATCH] HDFS-6407. Add sorting and pagination in the datanode tab of the NN Web UI. Contributed by Haohui Mai. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + hadoop-hdfs-project/hadoop-hdfs/pom.xml | 3 + .../src/main/webapps/hdfs/dfshealth.html | 20 +- .../src/main/webapps/hdfs/dfshealth.js | 17 + .../webapps/static/dataTables.bootstrap.css | 371 ++++++++++++++++++ .../webapps/static/dataTables.bootstrap.js | 205 ++++++++++ .../webapps/static/jquery.dataTables.min.js | 160 ++++++++ 7 files changed, 771 insertions(+), 8 deletions(-) create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index d1c24943d05..a540ccc743a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -450,6 +450,9 @@ Release 2.8.0 - UNRELEASED HDFS-8713. Convert DatanodeDescriptor to use SLF4J logging. (wang) + HDFS-6407. Add sorting and pagination in the datanode tab of the NN Web UI. + (wheat9) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index c47ec1a3a35..f32b2def6dd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -390,6 +390,9 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> src/main/webapps/static/dust-full-2.0.0.min.js src/main/webapps/static/dust-helpers-1.1.1.min.js src/main/webapps/static/jquery-1.10.2.min.js + src/main/webapps/static/jquery.dataTables.min.js + src/main/webapps/static/dataTables.bootstrap.css + src/main/webapps/static/dataTables.bootstrap.js diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html index 7e7604ac2c7..38808ca0305 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html @@ -20,6 +20,7 @@ + Namenode information @@ -290,7 +291,7 @@ - +
@@ -303,7 +304,7 @@ {#LiveNodes} - + - + {/LiveNodes} {#DeadNodes} - + - - - - + + + + {/DeadNodes}
Node
{name} ({xferaddr}){name} ({xferaddr}) {#helper_relative_time value="{lastContact}"/}
@@ -315,18 +316,18 @@
{numBlocks}{blockPoolUsed|fmt_bytes} ({blockPoolUsedPercent|fmt_percentage}){blockPoolUsed|fmt_bytes} ({blockPoolUsedPercent|fmt_percentage}) {version}
{name} ({xferaddr}){name} ({xferaddr}) {#helper_relative_time value="{lastContact}"/}----
@@ -418,7 +419,10 @@ There are no reported volume failures.