[HDFS-15362] FileWithSnapshotFeature#updateQuotaAndCollectBlocks should collect all distinct blocks

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 3.3.1, 3.4.0
• Fix Version/s: 3.3.1, 3.4.0
• Component/s: snapshots
• Target Version/s: 3.3.1, 3.4.0
• Hadoop Flags: Reviewed
• Assignee: Hemanth Boyina
• Reporter: Hemanth Boyina
• Created: 18/May/20 16:46
• Updated: 11/Feb/24 12:42
• Resolved: 27/May/20 18:06

Description

FileWithSnapshotFeature#updateQuotaAndCollectBlocks uses list to collect blocks 

 List<BlockInfo> allBlocks = new ArrayList<BlockInfo>();
 if (file.getBlocks() != null) {
    allBlocks.addAll(Arrays.asList(file.getBlocks()));
  }

 INodeFile#storagespaceConsumedContiguous collects all distinct blocks by set

// Collect all distinct blocks
 Set<BlockInfo> allBlocks = new HashSet<>(Arrays.asList(getBlocks()));
 DiffList<FileDiff> diffs = sf.getDiffs().asList();
 for(FileDiff diff : diffs) {
   BlockInfo[] diffBlocks = diff.getBlocks();
   if (diffBlocks != null) {
     allBlocks.addAll(Arrays.asList(diffBlocks));
 } 

but on updating the reclaim context we subtract these both , so wrong quota value can be updated

QuotaCounts current = file.storagespaceConsumed(bsp);
reclaimContext.quotaDelta().add(oldCounts.subtract(current));