Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 52800 invoked from network); 23 Nov 2010 01:52:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Nov 2010 01:52:36 -0000 Received: (qmail 52675 invoked by uid 500); 23 Nov 2010 01:53:08 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 52641 invoked by uid 500); 23 Nov 2010 01:53:08 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 52633 invoked by uid 99); 23 Nov 2010 01:53:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Nov 2010 01:53:08 +0000 X-ASF-Spam-Status: No, hits=-1998.0 required=10.0 tests=ALL_TRUSTED,FB_GET_MEDS X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Nov 2010 01:53:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E06F23888D7; Tue, 23 Nov 2010 01:51:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1037963 - in /hadoop/hdfs/branches/branch-0.22: ./ src/c++/libhdfs/ src/contrib/hdfsproxy/ src/java/ src/java/org/apache/hadoop/fs/ src/java/org/apache/hadoop/hdfs/ src/java/org/apache/hadoop/hdfs/server/datanode/ src/test/hdfs/ src/test/h... Date: Tue, 23 Nov 2010 01:51:35 -0000 To: hdfs-commits@hadoop.apache.org From: eli@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101123015135.8E06F23888D7@eris.apache.org> Author: eli Date: Tue Nov 23 01:51:34 2010 New Revision: 1037963 URL: http://svn.apache.org/viewvc?rev=1037963&view=rev Log: HDFS-1513. svn merge -c 1037961 from trunk Modified: hadoop/hdfs/branches/branch-0.22/ (props changed) hadoop/hdfs/branches/branch-0.22/CHANGES.txt hadoop/hdfs/branches/branch-0.22/build.xml (props changed) hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/ (props changed) hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ (props changed) hadoop/hdfs/branches/branch-0.22/src/java/ (props changed) hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java (props changed) hadoop/hdfs/branches/branch-0.22/src/test/hdfs/ (props changed) hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/fs/TestGlobPaths.java hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestLocalDFS.java hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/TestModTime.java hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/ (props changed) hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/ (props changed) hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/ (props changed) Propchange: hadoop/hdfs/branches/branch-0.22/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 23 01:51:34 2010 @@ -1,4 +1,4 @@ /hadoop/core/branches/branch-0.19/hdfs:713112 /hadoop/hdfs/branches/HDFS-265:796829-820463 /hadoop/hdfs/branches/branch-0.21:820487 -/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109 +/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961 Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1037963&r1=1037962&r2=1037963&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original) +++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Tue Nov 23 01:51:34 2010 @@ -213,7 +213,9 @@ Release 0.22.0 - Unreleased blocks are corrupt. (Patrick Kling via hairong) HDFS-259. Remove intentionally corrupt 0.13 directory layout creation. - (Todd Lipcon via eli). + (Todd Lipcon via eli) + + HDFS-1513. Fix a number of warnings. (eli) OPTIMIZATIONS Propchange: hadoop/hdfs/branches/branch-0.22/build.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 23 01:51:34 2010 @@ -2,4 +2,4 @@ /hadoop/core/trunk/build.xml:779102 /hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463 /hadoop/hdfs/branches/branch-0.21/build.xml:820487 -/hadoop/hdfs/trunk/build.xml:1036213,1036303,1036310,1036631,1036767,1037047,1037109 +/hadoop/hdfs/trunk/build.xml:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961 Propchange: hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 23 01:51:34 2010 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112 /hadoop/core/trunk/src/c++/libhdfs:776175-784663 -/hadoop/hdfs/trunk/src/c++/libhdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109 +/hadoop/hdfs/trunk/src/c++/libhdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961 Propchange: hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 23 01:51:34 2010 @@ -2,4 +2,4 @@ /hadoop/core/trunk/src/contrib/hdfsproxy:776175-784663 /hadoop/hdfs/branches/HDFS-265/src/contrib/hdfsproxy:796829-820463 /hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy:820487 -/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1036213,1036303,1036310,1036631,1036767,1037047,1037109 +/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961 Propchange: hadoop/hdfs/branches/branch-0.22/src/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 23 01:51:34 2010 @@ -2,4 +2,4 @@ /hadoop/core/trunk/src/hdfs:776175-785643,785929-786278 /hadoop/hdfs/branches/HDFS-265/src/java:796829-820463 /hadoop/hdfs/branches/branch-0.21/src/java:820487 -/hadoop/hdfs/trunk/src/java:1036213,1036303,1036310,1036631,1036767,1037047,1037109 +/hadoop/hdfs/trunk/src/java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961 Modified: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java?rev=1037963&r1=1037962&r2=1037963&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java (original) +++ hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/fs/Hdfs.java Tue Nov 23 01:51:34 2010 @@ -319,7 +319,7 @@ public class Hdfs extends AbstractFileSy @Override public void renameInternal(Path src, Path dst) throws IOException, UnresolvedLinkException { - dfs.rename(getUriPath(src), getUriPath(dst)); + dfs.rename(getUriPath(src), getUriPath(dst), Options.Rename.NONE); } @Override Modified: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java?rev=1037963&r1=1037962&r2=1037963&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java (original) +++ hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java Tue Nov 23 01:51:34 2010 @@ -183,7 +183,7 @@ public class DistributedFileSystem exten /** {@inheritDoc} */ @Override public Path getHomeDirectory() { - return new Path("/user/" + dfs.ugi.getShortUserName()).makeQualified(this); + return makeQualified(new Path("/user/" + dfs.ugi.getShortUserName())); } private String getPathName(Path file) { Modified: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java?rev=1037963&r1=1037962&r2=1037963&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java (original) +++ hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java Tue Nov 23 01:51:34 2010 @@ -353,13 +353,13 @@ public class HftpFileSystem extends File Long.valueOf(attrs.getValue("blocksize")).longValue(), modif, atime, FsPermission.valueOf(attrs.getValue("permission")), attrs.getValue("owner"), attrs.getValue("group"), - new Path(getUri().toString(), attrs.getValue("path")) - .makeQualified(HftpFileSystem.this)) + HftpFileSystem.this.makeQualified( + new Path(getUri().toString(), attrs.getValue("path")))) : new FileStatus(0L, true, 0, 0L, modif, atime, FsPermission.valueOf(attrs.getValue("permission")), attrs.getValue("owner"), attrs.getValue("group"), - new Path(getUri().toString(), attrs.getValue("path")) - .makeQualified(HftpFileSystem.this)); + HftpFileSystem.this.makeQualified( + new Path(getUri().toString(), attrs.getValue("path")))); fslist.add(fs); } Modified: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java?rev=1037963&r1=1037962&r2=1037963&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java (original) +++ hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java Tue Nov 23 01:51:34 2010 @@ -33,7 +33,6 @@ import java.util.LinkedList; import java.util.zip.Checksum; import org.apache.commons.logging.Log; -import org.apache.hadoop.fs.FSInputChecker; import org.apache.hadoop.fs.FSOutputSummer; import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.DatanodeInfo; @@ -695,6 +694,17 @@ class BlockReceiver implements java.io.C } /** + * Convert a checksum byte array to a long + */ + static private long checksum2long(byte[] checksum) { + long crc = 0L; + for(int i=0; i locatedBlocks = cluster.getNameNode().getBlockLocations( FILE_TO_READ, 0, FILE_SIZE).getLocatedBlocks(); Modified: hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java?rev=1037963&r1=1037962&r2=1037963&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java (original) +++ hadoop/hdfs/branches/branch-0.22/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java Tue Nov 23 01:51:34 2010 @@ -75,6 +75,7 @@ class MockHttpServletResponse implements status = sc; } + @Deprecated public void setStatus(int sc, java.lang.String sm) { } @@ -105,10 +106,12 @@ class MockHttpServletResponse implements public void sendError(int a, java.lang.String b) { } + @Deprecated public String encodeRedirectUrl(java.lang.String a) { return null; } + @Deprecated public String encodeUrl(java.lang.String url) { return null; } @@ -117,6 +120,7 @@ class MockHttpServletResponse implements return null; } + @Deprecated public String encodeURL(java.lang.String url) { return null; } Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 23 01:51:34 2010 @@ -2,4 +2,4 @@ /hadoop/core/trunk/src/webapps/datanode:776175-784663 /hadoop/hdfs/branches/HDFS-265/src/webapps/datanode:796829-820463 /hadoop/hdfs/branches/branch-0.21/src/webapps/datanode:820487 -/hadoop/hdfs/trunk/src/webapps/datanode:1036213,1036303,1036310,1036631,1036767,1037047,1037109 +/hadoop/hdfs/trunk/src/webapps/datanode:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961 Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 23 01:51:34 2010 @@ -2,4 +2,4 @@ /hadoop/core/trunk/src/webapps/hdfs:776175-784663 /hadoop/hdfs/branches/HDFS-265/src/webapps/hdfs:796829-820463 /hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs:820487 -/hadoop/hdfs/trunk/src/webapps/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109 +/hadoop/hdfs/trunk/src/webapps/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961 Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 23 01:51:34 2010 @@ -2,4 +2,4 @@ /hadoop/core/trunk/src/webapps/secondary:776175-784663 /hadoop/hdfs/branches/HDFS-265/src/webapps/secondary:796829-820463 /hadoop/hdfs/branches/branch-0.21/src/webapps/secondary:820487 -/hadoop/hdfs/trunk/src/webapps/secondary:1036213,1036303,1036310,1036631,1036767,1037047,1037109 +/hadoop/hdfs/trunk/src/webapps/secondary:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961