Skip to content

HDDS-10881. Recursive delete on special volume /tmp fails #6780

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
tanvipenumudy wants to merge 2 commits into from
+11 −3
Closed

HDDS-10881. Recursive delete on special volume /tmp fails #6780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cf24d2
HDDS-10881. Recursive delete on special volume /tmp fails
tanvipenumudy Jun 6, 2024
81be971
Merge remote-tracking branch 'origin/master' into HDDS-10881
adoroszlai Feb 18, 2025
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
3 changes: 2 additions & 1 deletion ...one/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/bucket/DeleteBucketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import static org.apache.hadoop.fs.FileSystem.FS_DEFAULT_NAME_KEY;
import static org.apache.hadoop.hdds.scm.net.NetConstants.PATH_SEPARATOR_STR;
import static org.apache.hadoop.ozone.OFSPath.OFS_MOUNT_TMP_VOLUMENAME;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_OFS_URI_SCHEME;
import static org.apache.hadoop.ozone.om.helpers.BucketLayout.OBJECT_STORE;

Expand Down Expand Up @@ -83,7 +84,7 @@ protected void execute(OzoneClient client, OzoneAddress address)
}
}
OzoneBucket bucket = vol.getBucket(bucketName);
if (bucket.getBucketLayout().equals(OBJECT_STORE)) {
if (bucket.getBucketLayout().equals(OBJECT_STORE) || vol.getName().equals(OFS_MOUNT_TMP_VOLUMENAME)) {
deleteOBSBucketRecursive(vol, bucket);
} else {
deleteFSBucketRecursive(vol, bucket);
Expand Down
11 changes: 9 additions & 2 deletions ...one/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/volume/DeleteVolumeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import static org.apache.hadoop.fs.FileSystem.FS_DEFAULT_NAME_KEY;
import static org.apache.hadoop.hdds.scm.net.NetConstants.PATH_SEPARATOR_STR;
import static org.apache.hadoop.ozone.OFSPath.OFS_MOUNT_TMP_VOLUMENAME;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_OFS_URI_SCHEME;

import java.io.IOException;
Expand Down Expand Up @@ -195,8 +196,14 @@ public void run() {
switch (bucket.getBucketLayout()) {
case FILE_SYSTEM_OPTIMIZED:
case LEGACY:
if (!cleanFSBucket(bucket)) {
throw new RuntimeException("Failed to clean bucket");
if (vol.getName().equals(OFS_MOUNT_TMP_VOLUMENAME)) {
if (!cleanOBSBucket(bucket)) {
throw new RuntimeException("Failed to clean bucket");
}
} else {
if (!cleanFSBucket(bucket)) {
throw new RuntimeException("Failed to clean bucket");
}
}
break;
case OBJECT_STORE:
Expand Down