Skip to content

HDDS-3982. Disable moveToTrash in o3fs and ofs temporarily #1215

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

Merged
smengcl merged 7 commits into from
Jul 21, 2020
Merged

HDDS-3982. Disable moveToTrash in o3fs and ofs temporarily #1215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f4ead5
BasicOzoneFileSystem#rename(src, dst, options)
smengcl Jul 17, 2020
a929357
Improve user message.
smengcl Jul 20, 2020
6829a70
if any
smengcl Jul 20, 2020
7c625df
Add testRenameToTrashDisabled for o3fs.
smengcl Jul 20, 2020
fc161c8
Add testRenameToTrashDisabled for ofs.
smengcl Jul 20, 2020
62dc794
Ignore existing test testDeleteToTrashOrSkipTrash because we have dis…
smengcl Jul 20, 2020
82d5af2
Add doc.
smengcl Jul 20, 2020
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
27 changes: 27 additions & 0 deletions ...p-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocatedFileStatus;
import org.apache.hadoop.fs.Options.Rename;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException;
import org.apache.hadoop.fs.permission.FsPermission;
Expand Down Expand Up @@ -397,6 +398,32 @@ public boolean rename(Path src, Path dst) throws IOException {
return result;
}

/**
* Intercept rename to trash calls from TrashPolicyDefault,
* convert them to delete calls instead.
*/
@Deprecated
protected void rename(final Path src, final Path dst,
final Rename... options) throws IOException {
boolean hasMoveToTrash = false;
if (options != null) {
for (Rename option : options) {
if (option == Rename.TO_TRASH) {
hasMoveToTrash = true;
break;
}
}
}
if (!hasMoveToTrash) {
// if doesn't have TO_TRASH option, just pass the call to super
super.rename(src, dst, options);
} else {
// intercept when TO_TRASH is found
Comment thread
smengcl marked this conversation as resolved.
LOG.info("Move to trash is disabled for o3fs, deleting instead: {}", src);
delete(src, true);
}
}

private class DeleteIterator extends OzoneListingIterator {
private boolean recursive;

Expand Down
27 changes: 27 additions & 0 deletions ...e/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocatedFileStatus;
import org.apache.hadoop.fs.Options;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException;
import org.apache.hadoop.fs.permission.FsPermission;
Expand Down Expand Up @@ -372,6 +373,32 @@ public boolean rename(Path src, Path dst) throws IOException {
return result;
}

/**
* Intercept rename to trash calls from TrashPolicyDefault,
* convert them to delete calls instead.
*/
@Deprecated
protected void rename(final Path src, final Path dst,
final Options.Rename... options) throws IOException {
boolean hasMoveToTrash = false;
if (options != null) {
for (Options.Rename option : options) {
if (option == Options.Rename.TO_TRASH) {
hasMoveToTrash = true;
break;
}
}
}
if (!hasMoveToTrash) {
// if doesn't have TO_TRASH option, just pass the call to super
super.rename(src, dst, options);
} else {
// intercept when TO_TRASH is found
LOG.info("Move to trash is disabled for ofs, deleting instead: {}", src);
delete(src, true);
}
}

private class DeleteIterator extends OzoneListingIterator {
final private boolean recursive;
private final OzoneBucket bucket;
Expand Down