From 1f8490a5bacd98d0d371447ada3b31f93ca40a4e Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Wed, 26 Oct 2016 08:55:42 -0700 Subject: [PATCH] HADOOP-13502. Split fs.contract.is-blobstore flag into more descriptive flags for use by contract tests. Contributed by Chris Nauroth. --- .gitignore | 1 + .../contract/AbstractContractCreateTest.java | 18 +++++++++--------- .../hadoop/fs/contract/ContractOptions.java | 18 ++++++++++++++++++ .../src/test/resources/contract/ftp.xml | 7 +------ .../src/test/resources/contract/s3a.xml | 5 +++++ .../src/test/resources/contract/s3n.xml | 10 ++++++++++ .../src/test/resources/contract/swift.xml | 10 ++++++++++ 7 files changed, 54 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 194862b31142c..cbecfc0f4450f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ yarnregistry.pdf hadoop-tools/hadoop-aws/src/test/resources/auth-keys.xml hadoop-tools/hadoop-aws/src/test/resources/contract-test-options.xml hadoop-tools/hadoop-azure/src/test/resources/azure-auth-keys.xml +hadoop-tools/hadoop-openstack/src/test/resources/auth-keys.xml patchprocess/ hadoop-tools/hadoop-aliyun/src/test/resources/auth-keys.xml hadoop-tools/hadoop-aliyun/src/test/resources/contract-test-options.xml diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java index 9344225d1751b..84dc775b98323 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java @@ -121,7 +121,7 @@ public void testOverwriteNonEmptyDirectory() throws Throwable { try { assertIsDirectory(path); } catch (AssertionError failure) { - if (isSupported(IS_BLOBSTORE)) { + if (isSupported(CREATE_OVERWRITES_DIRECTORY)) { // file/directory hack surfaces here throw new AssumptionViolatedException(failure.toString(), failure); } @@ -137,10 +137,10 @@ public void testOverwriteNonEmptyDirectory() throws Throwable { FileStatus status = getFileSystem().getFileStatus(path); boolean isDir = status.isDirectory(); - if (!isDir && isSupported(IS_BLOBSTORE)) { - // object store: downgrade to a skip so that the failure is visible - // in test results - skip("Object store allows a file to overwrite a directory"); + if (!isDir && isSupported(CREATE_OVERWRITES_DIRECTORY)) { + // For some file systems, downgrade to a skip so that the failure is + // visible in test results. + skip("This Filesystem allows a file to overwrite a directory"); } fail("write of file over dir succeeded"); } catch (FileAlreadyExistsException expected) { @@ -170,10 +170,10 @@ public void testCreatedFileIsImmediatelyVisible() throws Throwable { 1024)) { if (!getFileSystem().exists(path)) { - if (isSupported(IS_BLOBSTORE)) { - // object store: downgrade to a skip so that the failure is visible - // in test results - skip("Filesystem is an object store and newly created files are not immediately visible"); + if (isSupported(CREATE_VISIBILITY_DELAYED)) { + // For some file systems, downgrade to a skip so that the failure is + // visible in test results. + skip("This Filesystem delays visibility of newly created files"); } assertPathExists("expected path to be visible before anything written", path); diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractOptions.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractOptions.java index c8af062585831..b778f0d85428b 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractOptions.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractOptions.java @@ -36,17 +36,34 @@ public interface ContractOptions { */ String FS_CONTRACT_KEY = "fs.contract."; + /** + * Flag to indicate that a newly created file may overwrite a pre-existing + * directory. + * {@value} + */ + String CREATE_OVERWRITES_DIRECTORY = "create-overwrites-directory"; + + /** + * Flag to indicate that a newly created file is not made visible in the + * namespace immediately. Instead, the file becomes visible at a later point + * in the file creation lifecycle, such as when the client closes it. + * {@value} + */ + String CREATE_VISIBILITY_DELAYED = "create-visibility-delayed"; + /** * Is a filesystem case sensitive. * Some of the filesystems that say "no" here may mean * that it varies from platform to platform -the localfs being the key * example. + * {@value} */ String IS_CASE_SENSITIVE = "is-case-sensitive"; /** * Blobstore flag. Implies it's not a real directory tree and * consistency is below that which Hadoop expects + * {@value} */ String IS_BLOBSTORE = "is-blobstore"; @@ -196,6 +213,7 @@ public interface ContractOptions { /** * Limit for #of random seeks to perform. * Keep low for remote filesystems for faster tests + * {@value} */ String TEST_RANDOM_SEEK_COUNT = "test.random-seek-count"; diff --git a/hadoop-common-project/hadoop-common/src/test/resources/contract/ftp.xml b/hadoop-common-project/hadoop-common/src/test/resources/contract/ftp.xml index 9c3e380718c6c..f95446eb30a37 100644 --- a/hadoop-common-project/hadoop-common/src/test/resources/contract/ftp.xml +++ b/hadoop-common-project/hadoop-common/src/test/resources/contract/ftp.xml @@ -26,11 +26,6 @@ false - - fs.contract.is-blobstore - false - - fs.contract.is-case-sensitive true @@ -81,4 +76,4 @@ false - \ No newline at end of file + diff --git a/hadoop-tools/hadoop-aws/src/test/resources/contract/s3a.xml b/hadoop-tools/hadoop-aws/src/test/resources/contract/s3a.xml index be1e7ca6535fd..a534f0a77b2d5 100644 --- a/hadoop-tools/hadoop-aws/src/test/resources/contract/s3a.xml +++ b/hadoop-tools/hadoop-aws/src/test/resources/contract/s3a.xml @@ -37,6 +37,11 @@ true + + fs.contract.create-visibility-delayed + true + + fs.contract.is-case-sensitive true diff --git a/hadoop-tools/hadoop-aws/src/test/resources/contract/s3n.xml b/hadoop-tools/hadoop-aws/src/test/resources/contract/s3n.xml index cb8aca7d64428..0c6b8c69b7f49 100644 --- a/hadoop-tools/hadoop-aws/src/test/resources/contract/s3n.xml +++ b/hadoop-tools/hadoop-aws/src/test/resources/contract/s3n.xml @@ -37,6 +37,16 @@ true + + fs.contract.create-overwrites-directory + true + + + + fs.contract.create-visibility-delayed + true + + fs.contract.is-case-sensitive true diff --git a/hadoop-tools/hadoop-openstack/src/test/resources/contract/swift.xml b/hadoop-tools/hadoop-openstack/src/test/resources/contract/swift.xml index 12a67e0290a37..fbf3a177c91f0 100644 --- a/hadoop-tools/hadoop-openstack/src/test/resources/contract/swift.xml +++ b/hadoop-tools/hadoop-openstack/src/test/resources/contract/swift.xml @@ -37,6 +37,16 @@ true + + fs.contract.create-overwrites-directory + true + + + + fs.contract.create-visibility-delayed + true + + fs.contract.is-case-sensitive true