Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: hdfs-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1128543 - in /hadoop/hdfs/branches/branch-0.22:
 CHANGES.txt
 src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
 src/webapps/hdfs/dfshealth.jsp
Date: Sat, 28 May 2011 00:30:28 -0000
To: hdfs-commits@hadoop.apache.org
From: todd@apache.org
Message-Id: <20110528003028.3961023888FD@eris.apache.org>

Author: todd
Date: Sat May 28 00:30:27 2011
New Revision: 1128543

URL: http://svn.apache.org/viewvc?rev=1128543&view=rev
Log:
HDFS-1954. Improve corrupt files warning message on NameNode web UI. Contributed by Patrick Hunt.

Modified:
    hadoop/hdfs/branches/branch-0.22/CHANGES.txt
    hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
    hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/dfshealth.jsp

Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1128543&r1=1128542&r2=1128543&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Sat May 28 00:30:27 2011
@@ -249,6 +249,9 @@ Release 0.22.0 - Unreleased
 
     HDFS-1957. Add documentation for HFTP. (Ari Rabkin via todd)
 
+    HDFS-1954. Improve corrupt files warning message on NameNode web UI.
+    (Patrick Hunt via todd)
+
   OPTIMIZATIONS
 
     HDFS-1140. Speedup INode.getPathComponents. (Dmytro Molkov via shv)

Modified: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java?rev=1128543&r1=1128542&r2=1128543&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java (original)
+++ hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java Sat May 28 00:30:27 2011
@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.jsp.JspWriter;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DatanodeID;
 import org.apache.hadoop.hdfs.protocol.FSConstants.UpgradeAction;
@@ -133,12 +134,30 @@ class NamenodeJspHelper {
         + getUpgradeStatusText(fsn) + "\n</table></div>";
   }
 
-  static String getWarningText(FSNamesystem fsn) {
+  /**
+   * Generate warning text if there are corrupt files.
+   * @return a warning (incl. link to detail page) if files are corrupt,
+   * otherwise return an empty string.
+   */
+  static String getCorruptFilesWarning(FSNamesystem fsn) {
     // Ideally this should be displayed in RED
     long missingBlocks = fsn.getMissingBlocksCount();
     if (missingBlocks > 0) {
-      return "<br> WARNING :" + " There are about " + missingBlocks
-          + " missing blocks. Please check the log or run fsck. <br><br>";
+      StringBuilder result = new StringBuilder();
+
+      // Warning class is typically displayed in RED
+      result.append("<br/><a class=\"warning\" href=\"/corrupt_files.jsp\" title=\"List corrupt files\">\n");
+      result.append("<b>WARNING : There are " + missingBlocks
+          + " missing blocks. Please check the log or run fsck.</b>");
+      result.append("</a>");
+
+      result.append("<br/><div class=\"small\">Hint: A common mis-configuration is not ");
+      result.append("overriding \"" + DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY
+          + "\" on all datanodes");
+      result.append("(the default is typically /tmp which is not persistent)</div>");
+      result.append("<br/><br/>\n");
+
+      return result.toString();
     }
     return "";
   }

Modified: hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/dfshealth.jsp
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/dfshealth.jsp?rev=1128543&r1=1128542&r2=1128543&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/dfshealth.jsp (original)
+++ hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/dfshealth.jsp Sat May 28 00:30:27 2011
@@ -50,9 +50,7 @@
 <b> <%= NamenodeJspHelper.getSecurityModeText()%> </b>
 <b> <%= NamenodeJspHelper.getSafeModeText(fsn)%> </b>
 <b> <%= NamenodeJspHelper.getInodeLimitText(fsn)%> </b>
-<a class="warning" href="/corrupt_files.jsp" title="List corrupt files">
-  <%= NamenodeJspHelper.getWarningText(fsn)%>
-</a>
+<%= NamenodeJspHelper.getCorruptFilesWarning(fsn)%>
 
 <% healthjsp.generateHealthReport(out, nn, request); %>
 <hr>