HDDS-14418. Skip sending block deletion command to SCM for empty files. #9635
Conversation
|
@priyeshkaratha , can you add a unit test for this case? Manual test is good, but unit test is more preferred if not too difficult to create a new unit test. |
| keyBlocksList.size(), logSize, keyBlocksList.entrySet().stream().limit(logSize) | ||
| LOG.info("Send {} key(s) to SCM (filtered {} empty files), first {} keys: {}", | ||
| nonEmptyKeyBlocksList.size(), keyBlocksList.size() - nonEmptyKeyBlocksList.size(), logSize, | ||
| nonEmptyKeyBlocksList.entrySet().stream().limit(logSize) |
There was a problem hiding this comment.
These empty files can happen mostly in testing, No need to update normal logs to avoid confusion. Instead please add separate debug log if any empty files/blocks are present.
There was a problem hiding this comment.
+1. Lets keep them logged as DEBUG. Also probably use 'keys' instead of 'files' to maintain uniformity while logging
There was a problem hiding this comment.
Thanks for reviewing the changes. Addressed the changes mentioned.
| logSize = nonEmptyKeyBlocksList.size(); | ||
| } | ||
| LOG.info("Send {} key(s) to SCM, first {} keys: {}", | ||
| keyBlocksList.size(), logSize, keyBlocksList.entrySet().stream().limit(logSize) |
There was a problem hiding this comment.
Shall we include both nonEmptyKeyBlocksList and keyBlocksList info here too?
There was a problem hiding this comment.
Thanks @ChenSammi for the catch we can skip empty size keys here. I have updated the patch.
| } | ||
|
|
||
| // Add successful results for empty files (no need to send to SCM) | ||
| Map<String, PurgedKey> emptyKeyBlocksList = keyBlocksList.entrySet().stream() |
There was a problem hiding this comment.
Please add a nonEmptyKeyBlocksList and keyBlocksList size check before going into emptyKeyBlocksList construction and DeleteBlockGroupResult construction.
| * The KeyDeletingService should filter out empty keys before calling SCM. | ||
| */ | ||
| @Test | ||
| void checkIfDeleteServiceIsDeletingZeroSizedKeys() |
There was a problem hiding this comment.
Please add one more test for mixed file size case.
sadanand48
left a comment
sadanand48
left a comment
There was a problem hiding this comment.
LGTM overall, Thanks @priyeshkaratha for the patch
4 participants
What changes were proposed in this pull request?
When OM sends block deletion requests to SCM we can skip it if deleted blocklists are empty for the blockgroup. It indicates its delete request for empty file. So that we can also make sure fast deletion for keys that created with empty sizes.
What is the link to the Apache JIRA
HDDS-14418
How was this patch tested?
Tested locally using creating 1 empty file and 1 normal file and deleted both files. 1 file git skipped as per requirement.
CI is green