HDDS-13311. Directory Deleting Service can use deleteRange for subDirectories and subFiles #9423
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
…subDirectories and subFiles.
swamirishi
requested changes
Dec 3, 2025
Contributor
swamirishi
left a comment
swamirishi
left a comment
There was a problem hiding this comment.
thanks for the patch @aryangupta1998 Change this one fix I am reviewing other parts in the meanwhile
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
Outdated
Show resolved
Hide resolved
Contributor
|
Please wait for clean CI run in fork before opening PR. |
added 2 commits
December 4, 2025 00:58
swamirishi
requested changes
Dec 4, 2025
Contributor
swamirishi
left a comment
swamirishi
left a comment
There was a problem hiding this comment.
@aryangupta1998 please add unit tests for KeyManagerImpl and DirectoryDeletingService changes
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
Outdated
Show resolved
Hide resolved
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
Outdated
Show resolved
Hide resolved
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
Outdated
Show resolved
Hide resolved
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
Outdated
Show resolved
Hide resolved
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
Outdated
Show resolved
Hide resolved
Comment on lines
2325
to
2328
| if (startKey != null) { | ||
| keyRanges.add(new DeleteKeysResult.ExclusiveRange(startKey, lastLoopExclusiveKey)); | ||
| } | ||
| return new DeleteKeysResult(keyInfos, keyRanges, processedAllKeys); |
Contributor
There was a problem hiding this comment.
Suggested change
| if (startKey != null) { | |
| keyRanges.add(new DeleteKeysResult.ExclusiveRange(startKey, lastLoopExclusiveKey)); | |
| } | |
| return new DeleteKeysResult(keyInfos, keyRanges, processedAllKeys); | |
| boolean processedAllKeys = iterator.hasNext(); | |
| if (startKey != null) { | |
| keyRanges.add(new DeleteKeysResult.ExclusiveRange(startKey, processedAllKeys ? getLexicographicallyHigherString(seekFileInDB) : iterator.next().getKey())); | |
| } | |
| return new DeleteKeysResult(keyInfos, keyRanges, processedAllKeys); |
Contributor
Author
There was a problem hiding this comment.
It should be boolean processedAllKeys = !iterator.hasNext();
...ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
Outdated
Show resolved
Hide resolved
| private PurgePathRequest wrapPurgeRequest( | ||
| final long volumeId, final long bucketId, final String purgeDeletedDir, | ||
| final List<OmKeyInfo> purgeDeletedFiles, final List<OmKeyInfo> markDirsAsDeleted) { | ||
| return wrapPurgeRequest( |
Contributor
Author
There was a problem hiding this comment.
Two helper functions don't require ranges, and my added tests require a range parameter, which is why it's needed.
Contributor
|
@aryangupta1998 Don't make it ready for review until you get a +1 from reviewers |
adoroszlai
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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?
DirectoryDeletingService should use rocksdb deleteRange instead of creating individual tombstones which can cause seek time issue. But in the presence of snapshots the deleteRange APi should stitch continuous key ranges together that are reclaimable and not issue a blind deleteRange which could lead to incorrect reclaimation of the entry and lead to unreference orphan blocks when the snapshots are deleted.
DeleteRange APIs on FileTable, DirectoryTable, KeyTable can be used by background garbage collection services and should never be used by user facing APIs like keyDelete as that can cause issues in snapshot correctness.
E.g.
Then DirectoryDeletingService should issue 2 delete range like
[Dir1/Key1..Dir1/Key2] (Both inclusive)
[Dir1/Key4..Dir1/Key5]
In terms of rocksdb deleteRange where the end key range is exclusive this would be equivalent to
[Dir1/Key1..Dir1/Key3) and [Dir1/Key4..lexicographicalHigherString(Dir1/)]
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-13311
How was this patch tested?
Testes via UT.