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 aa...@apache.org on 2019/03/04 11:04:26 UTC
[hadoop] branch branch-2.8 updated: HADOOP-14170.
FileSystemContractBaseTest is not cleaning up test directory clearly.
Contributed by Mingliang Liu
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.8 by this push:
new 7f9e878 HADOOP-14170. FileSystemContractBaseTest is not cleaning up test directory clearly. Contributed by Mingliang Liu
7f9e878 is described below
commit 7f9e878292d0f6957a238ccdfa09ea7f454dc2a2
Author: Mingliang Liu <li...@apache.org>
AuthorDate: Mon Mar 13 15:19:06 2017 -0700
HADOOP-14170. FileSystemContractBaseTest is not cleaning up test directory clearly. Contributed by Mingliang Liu
(cherry picked from commit ed0d426a88b23965e4188188258a909aa866f012)
Conflicts:
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
---
.../hadoop/fs/FileSystemContractBaseTest.java | 209 +++++++++++++--------
.../hadoop/fs/s3a/ITestS3AFileSystemContract.java | 39 ++--
2 files changed, 141 insertions(+), 107 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
index 2a16799..a776a89 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
@@ -24,8 +24,9 @@ import java.util.ArrayList;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.security.AccessControlException;
@@ -44,8 +45,8 @@ import org.apache.hadoop.security.AccessControlException;
* </p>
*/
public abstract class FileSystemContractBaseTest extends TestCase {
- private static final Log LOG =
- LogFactory.getLog(FileSystemContractBaseTest.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(FileSystemContractBaseTest.class);
protected final static String TEST_UMASK = "062";
protected FileSystem fs;
@@ -53,9 +54,46 @@ public abstract class FileSystemContractBaseTest extends TestCase {
@Override
protected void tearDown() throws Exception {
- fs.delete(path("/test"), true);
+ if (fs != null) {
+ // some cases use this absolute path
+ if (rootDirTestEnabled()) {
+ cleanupDir(path("/FileSystemContractBaseTest"));
+ }
+ // others use this relative path against test base directory
+ cleanupDir(getTestBaseDir());
+ }
+ super.tearDown();
}
-
+
+ private void cleanupDir(Path p) {
+ try {
+ LOG.info("Deleting " + p);
+ fs.delete(p, true);
+ } catch (IOException e) {
+ LOG.error("Error deleting test dir: " + p, e);
+ }
+ }
+
+ /**
+ * Test base directory for resolving relative test paths.
+ *
+ * The default value is /user/$USER/FileSystemContractBaseTest. Subclass may
+ * set specific test base directory.
+ */
+ protected Path getTestBaseDir() {
+ return new Path(fs.getWorkingDirectory(), "FileSystemContractBaseTest");
+ }
+
+ /**
+ * For absolute path return the fully qualified path while for relative path
+ * return the fully qualified path against {@link #getTestBaseDir()}.
+ */
+ protected final Path path(String pathString) {
+ Path p = new Path(pathString).makeQualified(fs.getUri(), getTestBaseDir());
+ LOG.info("Resolving {} -> {}", pathString, p);
+ return p;
+ }
+
protected int getBlockSize() {
return 1024;
}
@@ -68,6 +106,17 @@ public abstract class FileSystemContractBaseTest extends TestCase {
return true;
}
+ /**
+ * Override this if the filesystem does not enable testing root directories.
+ *
+ * If this returns true, the test will create and delete test directories and
+ * files under root directory, which may have side effects, e.g. fail tests
+ * with PermissionDenied exceptions.
+ */
+ protected boolean rootDirTestEnabled() {
+ return true;
+ }
+
public void testFsStatus() throws Exception {
FsStatus fsStatus = fs.getStatus();
assertNotNull(fsStatus);
@@ -82,24 +131,24 @@ public abstract class FileSystemContractBaseTest extends TestCase {
Path workDir = path(getDefaultWorkingDirectory());
assertEquals(workDir, fs.getWorkingDirectory());
- fs.setWorkingDirectory(path("."));
+ fs.setWorkingDirectory(fs.makeQualified(new Path(".")));
assertEquals(workDir, fs.getWorkingDirectory());
- fs.setWorkingDirectory(path(".."));
+ fs.setWorkingDirectory(fs.makeQualified(new Path("..")));
assertEquals(workDir.getParent(), fs.getWorkingDirectory());
- Path relativeDir = path("hadoop");
+ Path relativeDir = fs.makeQualified(new Path("testWorkingDirectory"));
fs.setWorkingDirectory(relativeDir);
assertEquals(relativeDir, fs.getWorkingDirectory());
- Path absoluteDir = path("/test/hadoop");
+ Path absoluteDir = path("/FileSystemContractBaseTest/testWorkingDirectory");
fs.setWorkingDirectory(absoluteDir);
assertEquals(absoluteDir, fs.getWorkingDirectory());
}
public void testMkdirs() throws Exception {
- Path testDir = path("/test/hadoop");
+ Path testDir = path("testMkdirs");
assertFalse(fs.exists(testDir));
assertFalse(fs.isFile(testDir));
@@ -124,14 +173,15 @@ public abstract class FileSystemContractBaseTest extends TestCase {
}
public void testMkdirsFailsForSubdirectoryOfExistingFile() throws Exception {
- Path testDir = path("/test/hadoop");
+ Path testDir = path("testMkdirsFailsForSubdirectoryOfExistingFile");
assertFalse(fs.exists(testDir));
assertTrue(fs.mkdirs(testDir));
assertTrue(fs.exists(testDir));
- createFile(path("/test/hadoop/file"));
+ createFile(path("testMkdirsFailsForSubdirectoryOfExistingFile/file"));
- Path testSubDir = path("/test/hadoop/file/subdir");
+ Path testSubDir =
+ path("testMkdirsFailsForSubdirectoryOfExistingFile/file/subdir");
try {
fs.mkdirs(testSubDir);
fail("Should throw IOException.");
@@ -146,7 +196,8 @@ public abstract class FileSystemContractBaseTest extends TestCase {
// file missing execute permission.
}
- Path testDeepSubDir = path("/test/hadoop/file/deep/sub/dir");
+ Path testDeepSubDir = path(
+ "testMkdirsFailsForSubdirectoryOfExistingFile/file/deep/sub/dir");
try {
fs.mkdirs(testDeepSubDir);
fail("Should throw IOException.");
@@ -172,7 +223,7 @@ public abstract class FileSystemContractBaseTest extends TestCase {
String oldUmask = conf.get(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY);
try {
conf.set(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY, TEST_UMASK);
- final Path dir = new Path("/test/newDir");
+ final Path dir = new Path("newDir");
assertTrue(fs.mkdirs(dir, new FsPermission((short)0777)));
FileStatus status = fs.getFileStatus(dir);
assertTrue(status.isDirectory());
@@ -185,7 +236,8 @@ public abstract class FileSystemContractBaseTest extends TestCase {
public void testGetFileStatusThrowsExceptionForNonExistentFile()
throws Exception {
try {
- fs.getFileStatus(path("/test/hadoop/file"));
+ fs.getFileStatus(
+ path("testGetFileStatusThrowsExceptionForNonExistentFile/file"));
fail("Should throw FileNotFoundException");
} catch (FileNotFoundException e) {
// expected
@@ -194,7 +246,8 @@ public abstract class FileSystemContractBaseTest extends TestCase {
public void testListStatusThrowsExceptionForNonExistentFile() throws Exception {
try {
- fs.listStatus(path("/test/hadoop/file"));
+ fs.listStatus(
+ path("testListStatusThrowsExceptionForNonExistentFile/file"));
fail("Should throw FileNotFoundException");
} catch (FileNotFoundException fnfe) {
// expected
@@ -202,30 +255,32 @@ public abstract class FileSystemContractBaseTest extends TestCase {
}
public void testListStatus() throws Exception {
- Path[] testDirs = { path("/test/hadoop/a"),
- path("/test/hadoop/b"),
- path("/test/hadoop/c/1"), };
+ final Path[] testDirs = {
+ path("testListStatus/a"),
+ path("testListStatus/b"),
+ path("testListStatus/c/1")
+ };
assertFalse(fs.exists(testDirs[0]));
for (Path path : testDirs) {
assertTrue(fs.mkdirs(path));
}
- FileStatus[] paths = fs.listStatus(path("/test"));
+ FileStatus[] paths = fs.listStatus(path("."));
assertEquals(1, paths.length);
- assertEquals(path("/test/hadoop"), paths[0].getPath());
+ assertEquals(path("testListStatus"), paths[0].getPath());
- paths = fs.listStatus(path("/test/hadoop"));
+ paths = fs.listStatus(path("testListStatus"));
assertEquals(3, paths.length);
ArrayList<Path> list = new ArrayList<Path>();
for (FileStatus fileState : paths) {
list.add(fileState.getPath());
}
- assertTrue(list.contains(path("/test/hadoop/a")));
- assertTrue(list.contains(path("/test/hadoop/b")));
- assertTrue(list.contains(path("/test/hadoop/c")));
+ assertTrue(list.contains(path("testListStatus/a")));
+ assertTrue(list.contains(path("testListStatus/b")));
+ assertTrue(list.contains(path("testListStatus/c")));
- paths = fs.listStatus(path("/test/hadoop/a"));
+ paths = fs.listStatus(path("testListStatus/a"));
assertEquals(0, paths.length);
}
@@ -256,12 +311,12 @@ public abstract class FileSystemContractBaseTest extends TestCase {
* @throws IOException on IO failures
*/
protected void writeReadAndDelete(int len) throws IOException {
- Path path = path("/test/hadoop/file");
+ Path path = path("writeReadAndDelete/file");
writeAndRead(path, data, len, false, true);
}
public void testOverwrite() throws IOException {
- Path path = path("/test/hadoop/file");
+ Path path = path("testOverwrite/file");
fs.mkdirs(path.getParent());
@@ -287,7 +342,7 @@ public abstract class FileSystemContractBaseTest extends TestCase {
}
public void testWriteInNonExistentDirectory() throws IOException {
- Path path = path("/test/hadoop/file");
+ Path path = path("testWriteInNonExistentDirectory/file");
assertFalse("Parent exists", fs.exists(path.getParent()));
createFile(path);
@@ -297,15 +352,15 @@ public abstract class FileSystemContractBaseTest extends TestCase {
}
public void testDeleteNonExistentFile() throws IOException {
- Path path = path("/test/hadoop/file");
+ Path path = path("testDeleteNonExistentFile/file");
assertFalse("Path exists: " + path, fs.exists(path));
assertFalse("No deletion", fs.delete(path, true));
}
public void testDeleteRecursively() throws IOException {
- Path dir = path("/test/hadoop");
- Path file = path("/test/hadoop/file");
- Path subdir = path("/test/hadoop/subdir");
+ Path dir = path("testDeleteRecursively");
+ Path file = path("testDeleteRecursively/file");
+ Path subdir = path("testDeleteRecursively/subdir");
createFile(file);
assertTrue("Created subdir", fs.mkdirs(subdir));
@@ -331,7 +386,7 @@ public abstract class FileSystemContractBaseTest extends TestCase {
}
public void testDeleteEmptyDirectory() throws IOException {
- Path dir = path("/test/hadoop");
+ Path dir = path("testDeleteEmptyDirectory");
assertTrue(fs.mkdirs(dir));
assertTrue("Dir exists", fs.exists(dir));
assertTrue("Deleted", fs.delete(dir, false));
@@ -341,26 +396,26 @@ public abstract class FileSystemContractBaseTest extends TestCase {
public void testRenameNonExistentPath() throws Exception {
if (!renameSupported()) return;
- Path src = path("/test/hadoop/path");
- Path dst = path("/test/new/newpath");
+ Path src = path("testRenameNonExistentPath/path");
+ Path dst = path("testRenameNonExistentPathNew/newpath");
rename(src, dst, false, false, false);
}
public void testRenameFileMoveToNonExistentDirectory() throws Exception {
if (!renameSupported()) return;
- Path src = path("/test/hadoop/file");
+ Path src = path("testRenameFileMoveToNonExistentDirectory/file");
createFile(src);
- Path dst = path("/test/new/newfile");
+ Path dst = path("testRenameFileMoveToNonExistentDirectoryNew/newfile");
rename(src, dst, false, true, false);
}
public void testRenameFileMoveToExistingDirectory() throws Exception {
if (!renameSupported()) return;
- Path src = path("/test/hadoop/file");
+ Path src = path("testRenameFileMoveToExistingDirectory/file");
createFile(src);
- Path dst = path("/test/new/newfile");
+ Path dst = path("testRenameFileMoveToExistingDirectoryNew/newfile");
fs.mkdirs(dst.getParent());
rename(src, dst, true, false, true);
}
@@ -368,9 +423,9 @@ public abstract class FileSystemContractBaseTest extends TestCase {
public void testRenameFileAsExistingFile() throws Exception {
if (!renameSupported()) return;
- Path src = path("/test/hadoop/file");
+ Path src = path("testRenameFileAsExistingFile/file");
createFile(src);
- Path dst = path("/test/new/newfile");
+ Path dst = path("testRenameFileAsExistingFileNew/newfile");
createFile(dst);
rename(src, dst, false, true, true);
}
@@ -378,84 +433,84 @@ public abstract class FileSystemContractBaseTest extends TestCase {
public void testRenameFileAsExistingDirectory() throws Exception {
if (!renameSupported()) return;
- Path src = path("/test/hadoop/file");
+ Path src = path("testRenameFileAsExistingDirectory/file");
createFile(src);
- Path dst = path("/test/new/newdir");
+ Path dst = path("testRenameFileAsExistingDirectoryNew/newdir");
fs.mkdirs(dst);
rename(src, dst, true, false, true);
assertTrue("Destination changed",
- fs.exists(path("/test/new/newdir/file")));
+ fs.exists(path("testRenameFileAsExistingDirectoryNew/newdir/file")));
}
public void testRenameDirectoryMoveToNonExistentDirectory()
throws Exception {
if (!renameSupported()) return;
- Path src = path("/test/hadoop/dir");
+ Path src = path("testRenameDirectoryMoveToNonExistentDirectory/dir");
fs.mkdirs(src);
- Path dst = path("/test/new/newdir");
+ Path dst = path("testRenameDirectoryMoveToNonExistentDirectoryNew/newdir");
rename(src, dst, false, true, false);
}
public void testRenameDirectoryMoveToExistingDirectory() throws Exception {
if (!renameSupported()) return;
-
- Path src = path("/test/hadoop/dir");
+
+ Path src = path("testRenameDirectoryMoveToExistingDirectory/dir");
fs.mkdirs(src);
- createFile(path("/test/hadoop/dir/file1"));
- createFile(path("/test/hadoop/dir/subdir/file2"));
-
- Path dst = path("/test/new/newdir");
+ createFile(path(src + "/file1"));
+ createFile(path(src + "/subdir/file2"));
+
+ Path dst = path("testRenameDirectoryMoveToExistingDirectoryNew/newdir");
fs.mkdirs(dst.getParent());
rename(src, dst, true, false, true);
assertFalse("Nested file1 exists",
- fs.exists(path("/test/hadoop/dir/file1")));
+ fs.exists(path(src + "/file1")));
assertFalse("Nested file2 exists",
- fs.exists(path("/test/hadoop/dir/subdir/file2")));
+ fs.exists(path(src + "/subdir/file2")));
assertTrue("Renamed nested file1 exists",
- fs.exists(path("/test/new/newdir/file1")));
+ fs.exists(path(dst + "/file1")));
assertTrue("Renamed nested exists",
- fs.exists(path("/test/new/newdir/subdir/file2")));
+ fs.exists(path(dst + "/subdir/file2")));
}
public void testRenameDirectoryAsExistingFile() throws Exception {
if (!renameSupported()) return;
- Path src = path("/test/hadoop/dir");
+ Path src = path("testRenameDirectoryAsExistingFile/dir");
fs.mkdirs(src);
- Path dst = path("/test/new/newfile");
+ Path dst = path("testRenameDirectoryAsExistingFileNew/newfile");
createFile(dst);
rename(src, dst, false, true, true);
}
public void testRenameDirectoryAsExistingDirectory() throws Exception {
if (!renameSupported()) return;
-
- Path src = path("/test/hadoop/dir");
+
+ Path src = path("testRenameDirectoryAsExistingDirectory/dir");
fs.mkdirs(src);
- createFile(path("/test/hadoop/dir/file1"));
- createFile(path("/test/hadoop/dir/subdir/file2"));
+ createFile(path(src + "/file1"));
+ createFile(path(src + "/subdir/file2"));
- Path dst = path("/test/new/newdir");
+ Path dst = path("testRenameDirectoryAsExistingDirectoryNew/newdir");
fs.mkdirs(dst);
rename(src, dst, true, false, true);
assertTrue("Destination changed",
- fs.exists(path("/test/new/newdir/dir")));
+ fs.exists(path(dst + "/dir")));
assertFalse("Nested file1 exists",
- fs.exists(path("/test/hadoop/dir/file1")));
+ fs.exists(path(src + "/file1")));
assertFalse("Nested file2 exists",
- fs.exists(path("/test/hadoop/dir/subdir/file2")));
+ fs.exists(path(src + "r/subdir/file2")));
assertTrue("Renamed nested file1 exists",
- fs.exists(path("/test/new/newdir/dir/file1")));
+ fs.exists(path(dst + "/dir/file1")));
assertTrue("Renamed nested exists",
- fs.exists(path("/test/new/newdir/dir/subdir/file2")));
+ fs.exists(path(dst + "/dir/subdir/file2")));
}
public void testInputStreamClosedTwice() throws IOException {
//HADOOP-4760 according to Closeable#close() closing already-closed
//streams should have no effect.
- Path src = path("/test/hadoop/file");
+ Path src = path("testInputStreamClosedTwice/file");
createFile(src);
FSDataInputStream in = fs.open(src);
in.close();
@@ -465,17 +520,13 @@ public abstract class FileSystemContractBaseTest extends TestCase {
public void testOutputStreamClosedTwice() throws IOException {
//HADOOP-4760 according to Closeable#close() closing already-closed
//streams should have no effect.
- Path src = path("/test/hadoop/file");
+ Path src = path("testOutputStreamClosedTwice/file");
FSDataOutputStream out = fs.create(src);
out.writeChar('H'); //write some data
out.close();
out.close();
}
-
- protected Path path(String pathString) {
- return new Path(pathString).makeQualified(fs);
- }
-
+
protected void createFile(Path path) throws IOException {
FSDataOutputStream out = fs.create(path);
out.write(data, 0, data.length);
@@ -503,7 +554,7 @@ public abstract class FileSystemContractBaseTest extends TestCase {
byte[] filedata1 = dataset(blockSize * 2, 'A', 26);
byte[] filedata2 = dataset(blockSize * 2, 'a', 26);
- Path path = path("/test/hadoop/file-overwrite");
+ Path path = path("testOverWriteAndRead/file-overwrite");
writeAndRead(path, filedata1, blockSize, true, false);
writeAndRead(path, filedata2, blockSize, true, false);
writeAndRead(path, filedata1, blockSize * 2, true, false);
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFileSystemContract.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFileSystemContract.java
index f39ec81..6fcf4c7 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFileSystemContract.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFileSystemContract.java
@@ -57,30 +57,13 @@ public class ITestS3AFileSystemContract extends FileSystemContractBaseTest {
fs = S3ATestUtils.createTestFileSystem(conf);
basePath = fs.makeQualified(
- S3ATestUtils.createTestPath(new Path("/s3afilesystemcontract")));
+ S3ATestUtils.createTestPath(new Path("s3afilesystemcontract")));
super.setUp();
}
- /**
- * This path explicitly places all absolute paths under the per-test suite
- * path directory; this allows the test to run in parallel.
- * @param pathString path string as input
- * @return a qualified path string.
- */
- protected Path path(String pathString) {
- if (pathString.startsWith("/")) {
- return fs.makeQualified(new Path(basePath, pathString));
- } else {
- return super.path(pathString);
- }
- }
-
@Override
- protected void tearDown() throws Exception {
- if (fs != null) {
- fs.delete(basePath, true);
- }
- super.tearDown();
+ public Path getTestBaseDir() {
+ return basePath;
}
@Override
@@ -94,22 +77,22 @@ public class ITestS3AFileSystemContract extends FileSystemContractBaseTest {
return;
}
- Path src = path("/test/hadoop/dir");
+ Path src = path("testRenameDirectoryAsExisting/dir");
fs.mkdirs(src);
- createFile(path("/test/hadoop/dir/file1"));
- createFile(path("/test/hadoop/dir/subdir/file2"));
+ createFile(path(src + "/file1"));
+ createFile(path(src + "/subdir/file2"));
- Path dst = path("/test/new/newdir");
+ Path dst = path("testRenameDirectoryAsExistingNew/newdir");
fs.mkdirs(dst);
rename(src, dst, true, false, true);
assertFalse("Nested file1 exists",
- fs.exists(path("/test/hadoop/dir/file1")));
+ fs.exists(path(src + "/file1")));
assertFalse("Nested file2 exists",
- fs.exists(path("/test/hadoop/dir/subdir/file2")));
+ fs.exists(path(src + "/subdir/file2")));
assertTrue("Renamed nested file1 exists",
- fs.exists(path("/test/new/newdir/file1")));
+ fs.exists(path(dst + "/file1")));
assertTrue("Renamed nested exists",
- fs.exists(path("/test/new/newdir/subdir/file2")));
+ fs.exists(path(dst + "/subdir/file2")));
}
// @Override
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org