Author: jing9
Date: Wed Aug 7 20:44:51 2013
New Revision: 1511480
URL: http://svn.apache.org/r1511480
Log:
HDFS-4926. Merge change r1511478 from branch-2.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1511480&r1=1511479&r2=1511480&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Aug 7 20:44:51 2013
@@ -19,6 +19,9 @@ Release 2.1.1-beta - UNRELEASED
HDFS-4905. Add appendToFile command to "hdfs dfs". (Arpit Agarwal via
cnauroth)
+ HDFS-4926. Namenode webserver's page has a tooltip that is inconsistent
+ with the datanode HTML link. (Vivek Ganesan via jing9)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java?rev=1511480&r1=1511479&r2=1511480&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
Wed Aug 7 20:44:51 2013
@@ -709,10 +709,10 @@ class NamenodeJspHelper {
int idx = (suffix != null && name.endsWith(suffix)) ? name
.indexOf(suffix) : -1;
- out.print(rowTxt() + "<td class=\"name\"><a title=\"" + d.getXferAddr()
+ out.print(rowTxt() + "<td class=\"name\"> <a title=\"" + url
+ "\" href=\"" + url + "\">"
+ ((idx > 0) ? name.substring(0, idx) : name) + "</a>"
- + ((alive) ? "" : "\n"));
+ + ((alive) ? "" : "\n") + "<td class=\"address\">" +
d.getXferAddr());
}
void generateDecommissioningNodeData(JspWriter out, DatanodeDescriptor d,
@@ -746,10 +746,10 @@ class NamenodeJspHelper {
/*
* Say the datanode is dn1.hadoop.apache.org with ip 192.168.0.5 we use:
* 1) d.getHostName():d.getPort() to display. Domain and port are
stripped
- * if they are common across the nodes. i.e. "dn1"
- * 2) d.getHost():d.Port() for "title". i.e. "192.168.0.5:50010"
- * 3) d.getHostName():d.getInfoPort() for url.
+ * if they are common across the nodes. i.e. "dn1"
+ * 2) d.getHostName():d.getInfoPort() for url and title.
* i.e. "http://dn1.hadoop.apache.org:50075/...";
+ * 3) d.getXferAddr() for "Transferring Address". i.e.
"192.168.0.5:50010"
* Note that "d.getHost():d.getPort()" is what DFS clients use to
* interact with datanodes.
*/
@@ -880,7 +880,9 @@ class NamenodeJspHelper {
}
out.print("<tr class=\"headerRow\"> <th " + nodeHeaderStr("name")
- + "> Node <th " + nodeHeaderStr("lastcontact")
+ + "> Node <th " + nodeHeaderStr("address")
+ + "> Transferring<br>Address <th "
+ + nodeHeaderStr("lastcontact")
+ "> Last <br>Contact <th " + nodeHeaderStr("adminstate")
+ "> Admin State <th " + nodeHeaderStr("capacity")
+ "> Configured <br>Capacity (" + diskByteStr + ") <th "
@@ -896,8 +898,8 @@ class NamenodeJspHelper {
+ nodeHeaderStr("bpused") + "> Block Pool<br>Used ("
+ diskByteStr + ") <th "
+ nodeHeaderStr("pcbpused")
- + "> Block Pool<br>Used (%)"
- + "> Blocks <th " + nodeHeaderStr("volfails")
+ + "> Block Pool<br>Used (%)" + " <th "
+ + nodeHeaderStr("volfails")
+"> Failed Volumes\n");
JspHelper.sortNodeList(live, sorterField, sorterOrder);
@@ -915,7 +917,9 @@ class NamenodeJspHelper {
if (dead.size() > 0) {
out.print("<table border=1 cellspacing=0> <tr id=\"row1\"> "
+ "<th " + nodeHeaderStr("node")
- + "> Node <th " + nodeHeaderStr("decommissioned")
+ + "> Node <th " + nodeHeaderStr("address")
+ + "> Transferring<br>Address <th "
+ + nodeHeaderStr("decommissioned")
+ "> Decommissioned\n");
JspHelper.sortNodeList(dead, sorterField, sorterOrder);
@@ -935,7 +939,9 @@ class NamenodeJspHelper {
if (decommissioning.size() > 0) {
out.print("<table border=1 cellspacing=0> <tr class=\"headRow\"> "
+ "<th " + nodeHeaderStr("name")
- + "> Node <th " + nodeHeaderStr("lastcontact")
+ + "> Node <th " + nodeHeaderStr("address")
+ + "> Transferring<br>Address <th "
+ + nodeHeaderStr("lastcontact")
+ "> Last <br>Contact <th "
+ nodeHeaderStr("underreplicatedblocks")
+ "> Under Replicated Blocks <th "
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css?rev=1511480&r1=1511479&r2=1511480&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/hadoop.css
Wed Aug 7 20:44:51 2013
@@ -47,7 +47,6 @@ div#dfsnodetable a#title {
}
div#dfsnodetable td, th {
- border-bottom-style : none;
padding-bottom : 4px;
padding-top : 4px;
}
@@ -103,6 +102,7 @@ table.nodes td {
div#dfsnodetable td, div#dfsnodetable th, div.dfstable td {
padding-left : 10px;
padding-right : 10px;
+ border:1px solid black;
}
td.perc_filled {
