From dd5de5a756676d518271bd084c569bcd3dba9d65 Mon Sep 17 00:00:00 2001 From: Brandon Li Date: Tue, 21 Jan 2014 22:59:29 +0000 Subject: [PATCH] HDFS-5748. Merging change r1560215 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560216 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../src/main/webapps/hdfs/dfshealth.html | 417 +++++++++--------- .../src/main/webapps/hdfs/dfshealth.js | 172 +++++--- .../src/main/webapps/static/hadoop.css | 20 + 4 files changed, 338 insertions(+), 274 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 60587877411..290cc82b15c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -285,6 +285,9 @@ Release 2.4.0 - UNRELEASED HDFS-5800. Fix a typo in DFSClient.renewLease(). (Kousuke Saruta via szetszwo) + HDFS-5748. Too much information shown in the dfs health page. + (Haohui Mai via brandonli) + BREAKDOWN OF HDFS-2832 SUBTASKS AND RELATED JIRAS HDFS-4985. Add storage type to the protocol and expose it in block report 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 2a6b90601b9..461031a7937 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 @@ -23,25 +23,53 @@ Namenode information + + + +
+ +
+
+ +
+
+ +
+
+
+
+
+
+
-
-

Hadoop, 2013.

- +
+

Hadoop, 2014.

+ +
-
-
Snapshot Summary
-
- {#fs.SnapshotStats} - - - - - - - - - - -
Snapshottable directoriesSnapshotted directories
{SnapshottableDirectories}{Snapshots}
- {/fs.SnapshotStats} -
-
-
+ -{#startup} -
-
Startup Progress
-
-

Elapsed Time: {elapsedTime|fmt_time}, Percent Complete: {percentComplete|fmt_percentage}

- - - + + +