Merging change r1035141 from trunk to federation

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-1052@1078142 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -423,6 +423,8 @@ Release 0.22.0 - Unreleased
 
     HDFS-1160. Improve some FSDataset warnings and comments. (eli)
 
+    HDFS-556. Provide info on failed volumes in the web ui. (eli)
+
   OPTIMIZATIONS
 
     HDFS-1140. Speedup INode.getPathComponents. (Dmytro Molkov via shv)

src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java

@@ -520,7 +520,8 @@ class NamenodeJspHelper {
           + StringUtils.limitDecimalTo2(bpUsed * 1.0 / diskBytes)
           + "<td align=\"right\" class=\"pcbpused\">"
           + percentBpUsed
-          + "\n");
+          + "<td align=\"right\" class=\"volfails\">"
+          + d.getVolumeFailures() + "\n");
     }
 
     void generateNodesList(ServletContext context, JspWriter out,
@@ -605,7 +606,9 @@ class NamenodeJspHelper {
                 + nodeHeaderStr("bpused") + "> Block Pool<br>Used (" 
                 + diskByteStr + ") <th "
                 + nodeHeaderStr("pcbpused")
-                + "> Block Pool<br>Used (%)\n");
+                + "> Block Pool<br>Used (%)"
+                + "> Blocks <th " + nodeHeaderStr("volfails")
+                +"> Failed Volumes\n");
 
             JspHelper.sortNodeList(live, sorterField, sorterOrder);
             for (int i = 0; i < live.size(); i++) {