diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java index 21ad0872769..429e286287c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java @@ -116,7 +116,10 @@ protected int processKeyDeletes(List keyBlocksList, } List 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); @@ -126,11 +129,8 @@ protected int processKeyDeletes(List 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; } @@ -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, List> map, - String objectKey) { + private void addToMap(Map, List> 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 volumeBucketPair = Pair.of(split[1], split[2]); if (!map.containsKey(volumeBucketPair)) { map.put(volumeBucketPair, new ArrayList<>());