HDDS-14600. [FSO] Non-recursive dir deletion fails with "Directory is not empty" despite all children deleted when double buffer is not flushed #9739
+148
−5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… not empty" despite all children deleted when double buffer is not flushed
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes an FSO bucket bug where non-recursive directory deletion can incorrectly fail with Directory is not empty after children were deleted, due to tombstoned (cache-deleted but not yet DB-flushed) entries still being observed from RocksDB during hasChildren() checks.
Changes:
- Update
OMFileRequest#checkSubDirectoryExistsandcheckSubFileExiststo ignore DB entries that are marked deleted (tombstoned) in the table cache. - Add a unit test reproducing the failure mode at the OM request level.
- Add an integration test reproducing the failure via the public
FileSystem#deleteAPI.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
| hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java | Adjusts child-existence checks to account for cache tombstones vs DB visibility. |
| hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestWithFSO.java | Adds a focused unit regression test for deleting parent after deleting children. |
| hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java | Adds an integration regression test using FileSystem APIs and double-buffer manipulation to reproduce the bug. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
...ration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
Outdated
Show resolved
Hide resolved
...ration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
Show resolved
Hide resolved
...ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
Outdated
Show resolved
Hide resolved
...ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
Outdated
Show resolved
Hide resolved
...ager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestWithFSO.java
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This PR fixes a bug when using FSO buckets, non-recursive directory deletion could fail with "Directory is not empty" error after all children have been successfully deleted.
The issue is that cache tombstones are not properly checked in
checkSubFileExistsorcheckSubDirectoryExists.What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-14600
How was this patch tested?