Skip to content

fix: cleanup directory if empty after removal of snapshot #8002

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
DaanHoogland merged 3 commits into from
Sep 29, 2023
Merged

fix: cleanup directory if empty after removal of snapshot #8002

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20a2085
cleanup directory if empty after removal of snapshot
vishesh92 Sep 26, 2023
c887e37
Apply suggestions from code review
vishesh92 Sep 26, 2023
c4c631f
Update services/secondary-storage/server/src/main/java/org/apache/clo…
vishesh92 Sep 26, 2023
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 ...ver/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2050,6 +2050,13 @@ protected Answer deleteSnapshot(final DeleteCommand cmd) {
s_logger.warn(details);
return new Answer(cmd, false, details);
}

// delete the directory if it is empty
if (snapshotDir.isDirectory() && snapshotDir.list().length == 0 && !snapshotDir.delete()) {
details = String.format("Unable to delete directory [%s] at path [%s].", snapshotDir.getName(), snapshotPath);
s_logger.debug(details);
return new Answer(cmd, false, details);
Comment thread
harikrishna-patnala marked this conversation as resolved.
}
return new Answer(cmd, true, null);
} else if (dstore instanceof S3TO) {
final S3TO s3 = (S3TO)dstore;
Expand Down