You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2008/12/10 22:46:14 UTC
svn commit: r725450 - in /hadoop/core/branches/branch-0.18: CHANGES.txt
src/hdfs/org/apache/hadoop/dfs/LeaseManager.java
src/test/org/apache/hadoop/dfs/TestRenameWhileOpen.java
Author: szetszwo
Date: Wed Dec 10 13:46:14 2008
New Revision: 725450
URL: http://svn.apache.org/viewvc?rev=725450&view=rev
Log:
HADOOP-4806. HDFS rename should not use src path as a regular expression. (szetszwo)
Added:
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestRenameWhileOpen.java
Modified:
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/LeaseManager.java
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=725450&r1=725449&r2=725450&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Wed Dec 10 13:46:14 2008
@@ -88,6 +88,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/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/LeaseManager.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/LeaseManager.java?rev=725450&r1=725449&r2=725450&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/LeaseManager.java (original)
+++ hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/LeaseManager.java Wed Dec 10 13:46:14 2008
@@ -285,7 +285,8 @@
for(Map.Entry<String, Lease> 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);
}
Added: hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestRenameWhileOpen.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestRenameWhileOpen.java?rev=725450&view=auto
==============================================================================
--- hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestRenameWhileOpen.java (added)
+++ hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestRenameWhileOpen.java Wed Dec 10 13:46:14 2008
@@ -0,0 +1,356 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.dfs;
+
+import java.io.IOException;
+
+import org.apache.commons.logging.impl.Log4JLogger;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.BlockLocation;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.log4j.Level;
+
+public class TestRenameWhileOpen extends junit.framework.TestCase {
+ {
+ ((Log4JLogger)NameNode.stateChangeLog).getLogger().setLevel(Level.ALL);
+ ((Log4JLogger)LeaseManager.LOG).getLogger().setLevel(Level.ALL);
+ ((Log4JLogger)FSNamesystem.LOG).getLogger().setLevel(Level.ALL);
+ }
+
+ static final long seed = 0xDEADBEEFL;
+ static final int blockSize = 8192;
+ static final int numBlocks = 2;
+ static final int fileSize = numBlocks * blockSize + 1;
+
+ static private void checkData(byte[] actual, int from, byte[] expected, String message) {
+ for (int idx = 0; idx < actual.length; idx++) {
+ assertEquals(message+" byte "+(from+idx)+" differs. expected "+
+ expected[from+idx]+" actual "+actual[idx],
+ expected[from+idx], actual[idx]);
+ actual[idx] = 0;
+ }
+ }
+
+ static void checkFullFile(FileSystem fs, Path name) throws IOException {
+ FileStatus stat = fs.getFileStatus(name);
+ BlockLocation[] locations = fs.getFileBlockLocations(stat, 0,
+ fileSize);
+ for (int idx = 0; idx < locations.length; idx++) {
+ String[] hosts = locations[idx].getNames();
+ for (int i = 0; i < hosts.length; i++) {
+ System.out.print( hosts[i] + " ");
+ }
+ System.out.println(" off " + locations[idx].getOffset() +
+ " len " + locations[idx].getLength());
+ }
+
+ byte[] expected = AppendTestUtil.randomBytes(seed, fileSize);
+ FSDataInputStream stm = fs.open(name);
+ byte[] actual = new byte[fileSize];
+ stm.readFully(0, actual);
+ checkData(actual, 0, expected, "Read 2");
+ stm.close();
+ }
+
+ //
+ // writes to file but does not close it
+ //
+ static void writeFile(FSDataOutputStream stm) throws IOException {
+ writeFile(stm, fileSize);
+ }
+
+ //
+ // writes specified bytes to file.
+ //
+ static void writeFile(FSDataOutputStream stm, int size) throws IOException {
+ byte[] buffer = AppendTestUtil.randomBytes(seed, size);
+ stm.write(buffer, 0, size);
+ }
+
+ /**
+ * open /user/dir1/file1 /user/dir2/file2
+ * mkdir /user/dir3
+ * move /user/dir1 /user/dir3
+ */
+ public void testWhileOpenRenameParent() throws IOException {
+ Configuration conf = new Configuration();
+ final int MAX_IDLE_TIME = 2000; // 2s
+ conf.setInt("ipc.client.connection.maxidletime", MAX_IDLE_TIME);
+ conf.setInt("heartbeat.recheck.interval", 1000);
+ conf.setInt("dfs.heartbeat.interval", 1);
+ conf.setInt("dfs.safemode.threshold.pct", 1);
+
+ // create cluster
+ System.out.println("Test 1*****************************");
+ MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
+ FileSystem fs = null;
+ try {
+ cluster.waitActive();
+ fs = cluster.getFileSystem();
+ final int nnport = cluster.getNameNodePort();
+
+ // create file1.
+ 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: "
+ + "Created file " + file1);
+ writeFile(stm1);
+ stm1.sync();
+
+ // create file2.
+ Path dir2 = new Path("/user/dir2");
+ Path file2 = new Path(dir2, "file2");
+ FSDataOutputStream stm2 = TestFileCreation.createFile(fs, file2, 1);
+ System.out.println("testFileCreationDeleteParent: "
+ + "Created file " + file2);
+ writeFile(stm2);
+ stm2.sync();
+
+ // move dir1 while file1 is open
+ Path dir3 = new Path("/user/dir3");
+ fs.mkdirs(dir3);
+ fs.rename(dir1, dir3);
+
+ // restart cluster with the same namenode port as before.
+ // This ensures that leases are persisted in fsimage.
+ cluster.shutdown();
+ try {Thread.sleep(2*MAX_IDLE_TIME);} catch (InterruptedException e) {}
+ cluster = new MiniDFSCluster(nnport, conf, 1, false, true,
+ null, null, null);
+ cluster.waitActive();
+
+ // restart cluster yet again. This triggers the code to read in
+ // persistent leases from fsimage.
+ cluster.shutdown();
+ try {Thread.sleep(5000);} catch (InterruptedException e) {}
+ cluster = new MiniDFSCluster(nnport, conf, 1, false, true,
+ null, null, null);
+ cluster.waitActive();
+ fs = cluster.getFileSystem();
+
+ Path newfile = new Path("/user/dir3/dir1", "file1");
+ assertTrue(!fs.exists(file1));
+ assertTrue(fs.exists(file2));
+ assertTrue(fs.exists(newfile));
+ checkFullFile(fs, newfile);
+ } finally {
+ fs.close();
+ cluster.shutdown();
+ }
+ }
+
+ /**
+ * open /user/dir1/file1 /user/dir2/file2
+ * move /user/dir1 /user/dir3
+ */
+ public void testWhileOpenRenameParentToNonexistentDir() throws IOException {
+ Configuration conf = new Configuration();
+ final int MAX_IDLE_TIME = 2000; // 2s
+ conf.setInt("ipc.client.connection.maxidletime", MAX_IDLE_TIME);
+ conf.setInt("heartbeat.recheck.interval", 1000);
+ conf.setInt("dfs.heartbeat.interval", 1);
+ conf.setInt("dfs.safemode.threshold.pct", 1);
+ System.out.println("Test 2************************************");
+
+ // create cluster
+ MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
+ FileSystem fs = null;
+ try {
+ cluster.waitActive();
+ fs = cluster.getFileSystem();
+ final int nnport = cluster.getNameNodePort();
+
+ // create file1.
+ Path dir1 = new Path("/user/dir1");
+ Path file1 = new Path(dir1, "file1");
+ FSDataOutputStream stm1 = TestFileCreation.createFile(fs, file1, 1);
+ System.out.println("testFileCreationDeleteParent: "
+ + "Created file " + file1);
+ writeFile(stm1);
+ stm1.sync();
+
+ // create file2.
+ Path dir2 = new Path("/user/dir2");
+ Path file2 = new Path(dir2, "file2");
+ FSDataOutputStream stm2 = TestFileCreation.createFile(fs, file2, 1);
+ System.out.println("testFileCreationDeleteParent: "
+ + "Created file " + file2);
+ writeFile(stm2);
+ stm2.sync();
+
+ // move dir1 while file1 is open
+ Path dir3 = new Path("/user/dir3");
+ fs.rename(dir1, dir3);
+
+ // restart cluster with the same namenode port as before.
+ // This ensures that leases are persisted in fsimage.
+ cluster.shutdown();
+ try {Thread.sleep(2*MAX_IDLE_TIME);} catch (InterruptedException e) {}
+ cluster = new MiniDFSCluster(nnport, conf, 1, false, true,
+ null, null, null);
+ cluster.waitActive();
+
+ // restart cluster yet again. This triggers the code to read in
+ // persistent leases from fsimage.
+ cluster.shutdown();
+ try {Thread.sleep(5000);} catch (InterruptedException e) {}
+ cluster = new MiniDFSCluster(nnport, conf, 1, false, true,
+ null, null, null);
+ cluster.waitActive();
+ fs = cluster.getFileSystem();
+
+ Path newfile = new Path("/user/dir3", "file1");
+ assertTrue(!fs.exists(file1));
+ assertTrue(fs.exists(file2));
+ assertTrue(fs.exists(newfile));
+ checkFullFile(fs, newfile);
+ } finally {
+ fs.close();
+ cluster.shutdown();
+ }
+ }
+
+ /**
+ * open /user/dir1/file1
+ * mkdir /user/dir2
+ * move /user/dir1/file1 /user/dir2/
+ */
+ public void testWhileOpenRenameToExistentDirectory() throws IOException {
+ Configuration conf = new Configuration();
+ final int MAX_IDLE_TIME = 2000; // 2s
+ conf.setInt("ipc.client.connection.maxidletime", MAX_IDLE_TIME);
+ conf.setInt("heartbeat.recheck.interval", 1000);
+ conf.setInt("dfs.heartbeat.interval", 1);
+ conf.setInt("dfs.safemode.threshold.pct", 1);
+ System.out.println("Test 3************************************");
+
+ // create cluster
+ MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
+ FileSystem fs = null;
+ try {
+ cluster.waitActive();
+ fs = cluster.getFileSystem();
+ final int nnport = cluster.getNameNodePort();
+
+ // create file1.
+ Path dir1 = new Path("/user/dir1");
+ Path file1 = new Path(dir1, "file1");
+ FSDataOutputStream stm1 = TestFileCreation.createFile(fs, file1, 1);
+ System.out.println("testFileCreationDeleteParent: " +
+ "Created file " + file1);
+ writeFile(stm1);
+ stm1.sync();
+
+ Path dir2 = new Path("/user/dir2");
+ fs.mkdirs(dir2);
+
+ fs.rename(file1, dir2);
+
+ // restart cluster with the same namenode port as before.
+ // This ensures that leases are persisted in fsimage.
+ cluster.shutdown();
+ try {Thread.sleep(2*MAX_IDLE_TIME);} catch (InterruptedException e) {}
+ cluster = new MiniDFSCluster(nnport, conf, 1, false, true,
+ null, null, null);
+ cluster.waitActive();
+
+ // restart cluster yet again. This triggers the code to read in
+ // persistent leases from fsimage.
+ cluster.shutdown();
+ try {Thread.sleep(5000);} catch (InterruptedException e) {}
+ cluster = new MiniDFSCluster(nnport, conf, 1, false, true,
+ null, null, null);
+ cluster.waitActive();
+ fs = cluster.getFileSystem();
+
+ Path newfile = new Path("/user/dir2", "file1");
+ assertTrue(!fs.exists(file1));
+ assertTrue(fs.exists(newfile));
+ checkFullFile(fs, newfile);
+ } finally {
+ fs.close();
+ cluster.shutdown();
+ }
+ }
+
+ /**
+ * open /user/dir1/file1
+ * move /user/dir1/file1 /user/dir2/
+ */
+ public void testWhileOpenRenameToNonExistentDirectory() throws IOException {
+ Configuration conf = new Configuration();
+ final int MAX_IDLE_TIME = 2000; // 2s
+ conf.setInt("ipc.client.connection.maxidletime", MAX_IDLE_TIME);
+ conf.setInt("heartbeat.recheck.interval", 1000);
+ conf.setInt("dfs.heartbeat.interval", 1);
+ conf.setInt("dfs.safemode.threshold.pct", 1);
+ System.out.println("Test 4************************************");
+
+ // create cluster
+ MiniDFSCluster cluster = new MiniDFSCluster(conf, 1, true, null);
+ FileSystem fs = null;
+ try {
+ cluster.waitActive();
+ fs = cluster.getFileSystem();
+ final int nnport = cluster.getNameNodePort();
+
+ // create file1.
+ Path dir1 = new Path("/user/dir1");
+ Path file1 = new Path(dir1, "file1");
+ FSDataOutputStream stm1 = TestFileCreation.createFile(fs, file1, 1);
+ System.out.println("testFileCreationDeleteParent: "
+ + "Created file " + file1);
+ writeFile(stm1);
+ stm1.sync();
+
+ Path dir2 = new Path("/user/dir2");
+
+ fs.rename(file1, dir2);
+
+ // restart cluster with the same namenode port as before.
+ // This ensures that leases are persisted in fsimage.
+ cluster.shutdown();
+ try {Thread.sleep(2*MAX_IDLE_TIME);} catch (InterruptedException e) {}
+ cluster = new MiniDFSCluster(nnport, conf, 1, false, true,
+ null, null, null);
+ cluster.waitActive();
+
+ // restart cluster yet again. This triggers the code to read in
+ // persistent leases from fsimage.
+ cluster.shutdown();
+ try {Thread.sleep(5000);} catch (InterruptedException e) {}
+ cluster = new MiniDFSCluster(nnport, conf, 1, false, true,
+ null, null, null);
+ cluster.waitActive();
+ fs = cluster.getFileSystem();
+
+ Path newfile = new Path("/user", "dir2");
+ assertTrue(!fs.exists(file1));
+ assertTrue(fs.exists(newfile));
+ checkFullFile(fs, newfile);
+ } finally {
+ fs.close();
+ cluster.shutdown();
+ }
+ }
+}
\ No newline at end of file