Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 40774 invoked from network); 10 Dec 2008 21:36:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Dec 2008 21:36:42 -0000 Received: (qmail 52097 invoked by uid 500); 10 Dec 2008 21:36:54 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 52059 invoked by uid 500); 10 Dec 2008 21:36:54 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 52050 invoked by uid 99); 10 Dec 2008 21:36:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Dec 2008 13:36:54 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= 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; Wed, 10 Dec 2008 21:36:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 57F7B23888A2; Wed, 10 Dec 2008 13:36:19 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r725446 - in /hadoop/core/trunk: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java src/test/org/apache/hadoop/hdfs/TestRenameWhileOpen.java Date: Wed, 10 Dec 2008 21:36:19 -0000 To: core-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081210213619.57F7B23888A2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Wed Dec 10 13:36:18 2008 New Revision: 725446 URL: http://svn.apache.org/viewvc?rev=725446&view=rev Log: HADOOP-4806. HDFS rename should not use src path as a regular expression. (szetszwo) Modified: hadoop/core/trunk/CHANGES.txt hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRenameWhileOpen.java Modified: hadoop/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=725446&r1=725445&r2=725446&view=diff ============================================================================== --- hadoop/core/trunk/CHANGES.txt (original) +++ hadoop/core/trunk/CHANGES.txt Wed Dec 10 13:36:18 2008 @@ -1412,6 +1412,9 @@ HADOOP-4613. Fix block browsing on Web UI. (Johan Oskarsson via shv) + HADOOP-4806. HDFS rename should not use src path as a regular expression. + (szetszwo) + Release 0.18.2 - 2008-11-03 BUG FIXES Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java?rev=725446&r1=725445&r2=725446&view=diff ============================================================================== --- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java (original) +++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java Wed Dec 10 13:36:18 2008 @@ -284,7 +284,8 @@ for(Map.Entry entry : findLeaseWithPrefixPath(src, sortedLeasesByPath)) { final String oldpath = entry.getKey(); final Lease lease = entry.getValue(); - final String newpath = oldpath.replaceFirst(overwrite, replaceBy); + final String newpath = oldpath.replaceFirst( + java.util.regex.Pattern.quote(overwrite), replaceBy); if (LOG.isDebugEnabled()) { LOG.debug("changeLease: replacing " + oldpath + " with " + newpath); } Modified: hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRenameWhileOpen.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRenameWhileOpen.java?rev=725446&r1=725445&r2=725446&view=diff ============================================================================== --- hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRenameWhileOpen.java (original) +++ hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestRenameWhileOpen.java Wed Dec 10 13:36:18 2008 @@ -59,7 +59,7 @@ final int nnport = cluster.getNameNodePort(); // create file1. - Path dir1 = new Path("/user/dir1"); + Path dir1 = new Path("/user/a+b/dir1"); Path file1 = new Path(dir1, "file1"); FSDataOutputStream stm1 = TestFileCreation.createFile(fs, file1, 1); System.out.println("testFileCreationDeleteParent: "