Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-16622. addRDBI in IncrementalBlockReportManager may remove the block with bigger GS

This commit is contained in:
zengqiang.xu 2022-06-05 22:50:47 +08:00
parent 25591ef51b
commit 91f7ff3a99
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/IncrementalBlockReportManager.java
View File

@ -251,12 +251,20 @@ class IncrementalBlockReportManager {
DatanodeStorage storage) { DatanodeStorage storage) {
// Make sure another entry for the same block is first removed. // Make sure another entry for the same block is first removed.
// There may only be one such entry. // There may only be one such entry.
ReceivedDeletedBlockInfo removedInfo = null;
for (PerStorageIBR perStorage : pendingIBRs.values()) { for (PerStorageIBR perStorage : pendingIBRs.values()) {
if (perStorage.remove(rdbi.getBlock()) != null) { removedInfo = perStorage.remove(rdbi.getBlock());
if (removedInfo != null) {
break; break;
} }
} }
getPerStorageIBR(storage).put(rdbi); if (removedInfo != null &&
removedInfo.getBlock().getGenerationStamp()
> rdbi.getBlock().getGenerationStamp()) {
getPerStorageIBR(storage).put(removedInfo);
} else {
getPerStorageIBR(storage).put(rdbi);
}
} }
synchronized void notifyNamenodeBlock(ReceivedDeletedBlockInfo rdbi, synchronized void notifyNamenodeBlock(ReceivedDeletedBlockInfo rdbi,