Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1086650 - in
 /hadoop/common/branches/branch-0.20-security-203:
 CHANGES.txt
 src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
 src/test/org/apache/hadoop/hdfs/TestListPathServlet.java
 src/webapps/datanode/browseDirectory.jsp
Date: Tue, 29 Mar 2011 17:37:12 -0000
To: common-commits@hadoop.apache.org
From: omalley@apache.org
Message-Id: <20110329173712.1FD0523888FD@eris.apache.org>

Author: omalley
Date: Tue Mar 29 17:37:11 2011
New Revision: 1086650

URL: http://svn.apache.org/viewvc?rev=1086650&view=rev
Log:
HDFS-1598 Revert HDFS-1598 (szetszwo)

Modified:
    hadoop/common/branches/branch-0.20-security-203/CHANGES.txt
    hadoop/common/branches/branch-0.20-security-203/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
    hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java
    hadoop/common/branches/branch-0.20-security-203/src/webapps/datanode/browseDirectory.jsp

Modified: hadoop/common/branches/branch-0.20-security-203/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt?rev=1086650&r1=1086649&r2=1086650&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-203/CHANGES.txt Tue Mar 29 17:37:11 2011
@@ -32,9 +32,6 @@ Release 0.20.203.0 - unreleased
     MAPREDUCE-2364. Don't hold the rjob lock while localizing resources. (ddas
     via omalley)
 
-    HDFS:1598. Directory listing on hftp:// does not show
-    .*.crc files.  (szetszwo)
-
     MAPREDUCE-2365. New counters for FileInputFormat (BYTES_READ) and 
     FileOutputFormat (BYTES_WRITTEN). 
     New counter MAP_OUTPUT_MATERIALIZED_BYTES for compressed MapOutputSize.

Modified: hadoop/common/branches/branch-0.20-security-203/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java?rev=1086650&r1=1086649&r2=1086650&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java (original)
+++ hadoop/common/branches/branch-0.20-security-203/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java Tue Mar 29 17:37:11 2011
@@ -85,7 +85,7 @@ public class ListPathsServlet extends Df
     final String path = request.getPathInfo() != null
       ? request.getPathInfo() : "/";
     final String exclude = request.getParameter("exclude") != null
-      ? request.getParameter("exclude") : "";
+      ? request.getParameter("exclude") : "\\..*\\.crc";
     final String filter = request.getParameter("filter") != null
       ? request.getParameter("filter") : ".*";
     final boolean recur = request.getParameter("recursive") != null

Modified: hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java?rev=1086650&r1=1086649&r2=1086650&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java (original)
+++ hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java Tue Mar 29 17:37:11 2011
@@ -94,7 +94,7 @@ public class TestListPathServlet {
     checkStatus("/");
 
     // A directory with files and directories
-    createFile("/dir/.a.crc", 1);
+    createFile("/dir/a", 1);
     createFile("/dir/b", 1);
     mkdirs("/dir/dir1");
     checkStatus("/dir");

Modified: hadoop/common/branches/branch-0.20-security-203/src/webapps/datanode/browseDirectory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/webapps/datanode/browseDirectory.jsp?rev=1086650&r1=1086649&r2=1086650&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/src/webapps/datanode/browseDirectory.jsp (original)
+++ hadoop/common/branches/branch-0.20-security-203/src/webapps/datanode/browseDirectory.jsp Tue Mar 29 17:37:11 2011
@@ -117,6 +117,7 @@
           for (int i = 0; i < files.length; i++) {
             //Get the location of the first block of the file
             String localname = files[i].getLocalName();
+            if (localname.endsWith(".crc")) continue;
             if (!files[i].isDir()) {
               cols[1] = "file";
               cols[2] = StringUtils.byteDesc(files[i].getLen());