Fix race condition between IBR and Edit tailing on Standby

apache · Apr 4, 2024 · 7556dbe · 7556dbe
1 parent d7157b4
commit 7556dbe
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.../src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java b/.../src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java
@@ -95,15 +95,21 @@ void removeAllMessagesForDatanode(DatanodeDescriptor dn) {
 
   void enqueueReportedBlock(DatanodeStorageInfo storageInfo, Block block,
       ReplicaState reportedState) {
+    long genStamp = block.getGenerationStamp();
     if (BlockIdManager.isStripedBlockID(block.getBlockId())) {
       Block blkId = new Block(BlockIdManager.convertToStripedID(block
           .getBlockId()));
-      getBlockQueue(blkId).add(
-          new ReportedBlockInfo(storageInfo, new Block(block), reportedState));
+      Queue<ReportedBlockInfo> queue = getBlockQueue(blkId);
+      queue.removeIf(rbi -> rbi.storageInfo.equals(storageInfo) &&
+          rbi.block.getGenerationStamp() < genStamp);
+      queue.add(new ReportedBlockInfo(storageInfo, new Block(block), reportedState));
     } else {
       block = new Block(block);
-      getBlockQueue(block).add(
-          new ReportedBlockInfo(storageInfo, block, reportedState));
+      Queue<ReportedBlockInfo> queue = getBlockQueue(block);
+      // Remove the existing reports for this block since they are probably older and out of date
+      queue.removeIf(rbi -> rbi.storageInfo.equals(storageInfo) &&
+          rbi.block.getGenerationStamp() < genStamp);
+      queue.add(new ReportedBlockInfo(storageInfo, block, reportedState));
     }
     count++;
   }