Skip to content

HDDS-10680. Duplicate delete key blocks sent to SCM #6513

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
ChenSammi merged 2 commits into from
Apr 17, 2024
Merged

HDDS-10680. Duplicate delete key blocks sent to SCM #6513

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f05aad
HDDS-10680. Duplicate delete key blocks sent to SCM
ChenSammi Apr 11, 2024
d051b87
add objectKey name in error message to facilitate issue debug
ChenSammi Apr 15, 2024
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
20 changes: 11 additions & 9 deletions ...-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ protected int processKeyDeletes(List<BlockGroup> keyBlocksList,
}
List<DeleteBlockGroupResult> blockDeletionResults =
scmClient.deleteKeyBlocks(keyBlocksList);
LOG.info("{} BlockGroup deletion are acked by SCM in {} ms",
keyBlocksList.size(), Time.monotonicNow() - startTime);
if (blockDeletionResults != null) {
startTime = Time.monotonicNow();
if (isRatisEnabled()) {
delCount = submitPurgeKeysRequest(blockDeletionResults,
keysToModify, snapTableKey);
Expand All @@ -126,11 +129,8 @@ protected int processKeyDeletes(List<BlockGroup> keyBlocksList,
// OMRequest model.
delCount = deleteAllKeys(blockDeletionResults, manager);
}
if (LOG.isDebugEnabled()) {
LOG.debug("Blocks for {} (out of {}) keys are deleted in {} ms",
delCount, blockDeletionResults.size(),
Time.monotonicNow() - startTime);
}
LOG.info("Blocks for {} (out of {}) keys are deleted from DB in {} ms",
delCount, blockDeletionResults.size(), Time.monotonicNow() - startTime);
}
return delCount;
}
Expand Down Expand Up @@ -277,12 +277,14 @@ protected RaftClientRequest createRaftClientRequestForPurge(
* Parse Volume and Bucket Name from ObjectKey and add it to given map of
* keys to be purged per bucket.
*/
private void addToMap(Map<Pair<String, String>, List<String>> map,
String objectKey) {
private void addToMap(Map<Pair<String, String>, List<String>> map, String objectKey) {
// Parse volume and bucket name
String[] split = objectKey.split(OM_KEY_PREFIX);
Preconditions.assertTrue(split.length > 3, "Volume and/or Bucket Name " +
"missing from Key Name.");
Preconditions.assertTrue(split.length >= 3, "Volume and/or Bucket Name " +
"missing from Key Name " + objectKey);
if (split.length == 3) {
LOG.warn("{} missing Key Name", objectKey);
}
Pair<String, String> volumeBucketPair = Pair.of(split[1], split[2]);
if (!map.containsKey(volumeBucketPair)) {
map.put(volumeBucketPair, new ArrayList<>());
Expand Down