Skip to content

HADOOP-16380. S3A non-recursive deletion of root to return false #1106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bgaborg wants to merge 3 commits into from
Closed

HADOOP-16380. S3A non-recursive deletion of root to return false #1106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
038913a
HADOOP-16380. S3A non-recursive deletion of root to return false
Jul 16, 2019
6150c5e
Simplify deletion of root in S3A
Jul 17, 2019
32b3e6f
fix test_400_rm_root_recursive with new behaviour
Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2193,6 +2193,13 @@ void removeKeys(
*/
@Retries.RetryTranslated
public boolean delete(Path f, boolean recursive) throws IOException {
if (f.isRoot()) {
Copy link
Contributor

@steveloughran steveloughran Jul 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should go after the entrypoint, so that the metrics are incremented and FS open/closed state are checked

if (!recursive) {
return false;
}
LOG.debug("Deleting root content recursively");
}

try {
entryPoint(INVOCATION_DELETE);
boolean outcome = innerDelete(innerGetFileStatus(f, true), recursive);
Expand Down
6 changes: 6 additions & 0 deletions ...s/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractRootDir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.hadoop.fs.contract.AbstractFSContract;
import org.apache.hadoop.fs.s3a.S3AFileSystem;

import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -62,6 +63,11 @@ public S3AFileSystem getFileSystem() {
return (S3AFileSystem) super.getFileSystem();
}

@Override
@Ignore("S3 always return false when non-recursively remove root dir")
public void testRmNonEmptyRootDirNonRecursive() throws Throwable {
}

/**
* This is overridden to allow for eventual consistency on listings,
* but only if the store does not have S3Guard protecting it.
Expand Down