[44/50] [abbrv] hadoop git commit: HDFS-6407. Add sorting and pagination in the datanode tab of the NN Web UI. Contributed by Haohui Mai.

2015-08-24 Thread zhz 
HDFS-6407. Add sorting and pagination in the datanode tab of the NN Web UI. 
Contributed by Haohui Mai.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/456e901a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/456e901a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/456e901a

Branch: refs/heads/HDFS-7285
Commit: 456e901a4c5c639267ee87b8e5f1319f256d20c2
Parents: 2e7b7e2
Author: Haohui Mai whe...@apache.org
Authored: Mon Aug 17 11:04:00 2015 -0700
Committer: Haohui Mai whe...@apache.org
Committed: Mon Aug 17 11:04:00 2015 -0700

--
 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 +++
 .../main/webapps/static/dataTables.bootstrap.js | 205 ++
 .../webapps/static/jquery.dataTables.min.js | 160 
 7 files changed, 771 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/456e901a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index bfd95f7..c12e678 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -793,6 +793,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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/456e901a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml 
b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 145a8cd..1a29ad3 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;
 excludesrc/main/webapps/static/dust-full-2.0.0.min.js/exclude
 
excludesrc/main/webapps/static/dust-helpers-1.1.1.min.js/exclude
 excludesrc/main/webapps/static/jquery-1.10.2.min.js/exclude
+excludesrc/main/webapps/static/jquery.dataTables.min.js/exclude
+excludesrc/main/webapps/static/dataTables.bootstrap.css/exclude
+excludesrc/main/webapps/static/dataTables.bootstrap.js/exclude
   /excludes
 /configuration
   /plugin

http://git-wip-us.apache.org/repos/asf/hadoop/blob/456e901a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
--
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 7e7604a..38808ca 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 @@
 head
 meta http-equiv=X-UA-Compatible content=IE=9 /
 link rel=stylesheet type=text/css 
href=/static/bootstrap-3.0.2/css/bootstrap.min.css /
+link rel=stylesheet type=text/css href=/static/dataTables.bootstrap.css 
/
 link rel=stylesheet type=text/css href=/static/hadoop.css /
 titleNamenode information/title
 /head
@@ -290,7 +291,7 @@
 /div
 div class=page-headerh1smallIn operation/small/h1/div
 small
-table class=table
+table class=table id=table-datanodes
   thead
 tr
   thNode/th
@@ -303,7 +304,7 @@
   /thead
   {#LiveNodes}
   tr
-td class=dfshealth-node-icon dfshealth-node-{state}{name} 
({xferaddr})/td
+td ng-value={state}-{name} class=dfshealth-node-icon 
dfshealth-node-{state}{name} ({xferaddr})/td
 td ng-value={lastContact}{#helper_relative_time 
value={lastContact}/}/td
 td ng-value={usedPercentage}
   div
@@ -315,18 +316,18 @@
   /div
 /td
 td{numBlocks}/td
-td{blockPoolUsed|fmt_bytes} ({blockPoolUsedPercent|fmt_percentage})/td
+td ng-value={blockPoolUsedPercent}{blockPoolUsed|fmt_bytes} 
({blockPoolUsedPercent|fmt_percentage})/td
 td{version}/td
   /tr
   {/LiveNodes}
   {#DeadNodes}
   tr class=danger
-td class=dfshealth-node-icon dfshealth-node-{state}{name} 
({xferaddr})/td
+td ng-value={state}-{name} class=dfshealth-node-icon 
dfshealth-node-{state}{name} ({xferaddr})/td
 td{#helper_relative_time value={lastContact}/}/td
-td-/td
-td-/td
-td-/td
-td-/td
+td/td
+td/td
+

[44/50] [abbrv] hadoop git commit: HDFS-6407. Add sorting and pagination in the datanode tab of the NN Web UI. Contributed by Haohui Mai.

2015-08-20 Thread zhz 
HDFS-6407. Add sorting and pagination in the datanode tab of the NN Web UI. 
Contributed by Haohui Mai.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/456e901a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/456e901a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/456e901a

Branch: refs/heads/HDFS-7285-merge
Commit: 456e901a4c5c639267ee87b8e5f1319f256d20c2
Parents: 2e7b7e2
Author: Haohui Mai whe...@apache.org
Authored: Mon Aug 17 11:04:00 2015 -0700
Committer: Haohui Mai whe...@apache.org
Committed: Mon Aug 17 11:04:00 2015 -0700

--
 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 +++
 .../main/webapps/static/dataTables.bootstrap.js | 205 ++
 .../webapps/static/jquery.dataTables.min.js | 160 
 7 files changed, 771 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/456e901a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index bfd95f7..c12e678 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -793,6 +793,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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/456e901a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml 
b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 145a8cd..1a29ad3 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;
 excludesrc/main/webapps/static/dust-full-2.0.0.min.js/exclude
 
excludesrc/main/webapps/static/dust-helpers-1.1.1.min.js/exclude
 excludesrc/main/webapps/static/jquery-1.10.2.min.js/exclude
+excludesrc/main/webapps/static/jquery.dataTables.min.js/exclude
+excludesrc/main/webapps/static/dataTables.bootstrap.css/exclude
+excludesrc/main/webapps/static/dataTables.bootstrap.js/exclude
   /excludes
 /configuration
   /plugin

http://git-wip-us.apache.org/repos/asf/hadoop/blob/456e901a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
--
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 7e7604a..38808ca 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 @@
 head
 meta http-equiv=X-UA-Compatible content=IE=9 /
 link rel=stylesheet type=text/css 
href=/static/bootstrap-3.0.2/css/bootstrap.min.css /
+link rel=stylesheet type=text/css href=/static/dataTables.bootstrap.css 
/
 link rel=stylesheet type=text/css href=/static/hadoop.css /
 titleNamenode information/title
 /head
@@ -290,7 +291,7 @@
 /div
 div class=page-headerh1smallIn operation/small/h1/div
 small
-table class=table
+table class=table id=table-datanodes
   thead
 tr
   thNode/th
@@ -303,7 +304,7 @@
   /thead
   {#LiveNodes}
   tr
-td class=dfshealth-node-icon dfshealth-node-{state}{name} 
({xferaddr})/td
+td ng-value={state}-{name} class=dfshealth-node-icon 
dfshealth-node-{state}{name} ({xferaddr})/td
 td ng-value={lastContact}{#helper_relative_time 
value={lastContact}/}/td
 td ng-value={usedPercentage}
   div
@@ -315,18 +316,18 @@
   /div
 /td
 td{numBlocks}/td
-td{blockPoolUsed|fmt_bytes} ({blockPoolUsedPercent|fmt_percentage})/td
+td ng-value={blockPoolUsedPercent}{blockPoolUsed|fmt_bytes} 
({blockPoolUsedPercent|fmt_percentage})/td
 td{version}/td
   /tr
   {/LiveNodes}
   {#DeadNodes}
   tr class=danger
-td class=dfshealth-node-icon dfshealth-node-{state}{name} 
({xferaddr})/td
+td ng-value={state}-{name} class=dfshealth-node-icon 
dfshealth-node-{state}{name} ({xferaddr})/td
 td{#helper_relative_time value={lastContact}/}/td
-td-/td
-td-/td
-td-/td
-td-/td
+td/td
+