HDFS-17218. Fix UT failed

haiyang1987 · haiyang1987 · commit 6024caf2a7e4 · 2023-10-13T14:04:04.000+08:00
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HeartbeatManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HeartbeatManager.java
@@ -243,7 +243,7 @@ synchronized void register(final DatanodeDescriptor d) {
       // remove blocks from invalidateBlocks by datanode.
       blockManager.removeBlocksFromInvalidateBlocks(d);
       // add blocks into postponed queue only when active NN is out of safe mode.
-      if (!set.isEmpty() && blockManager.isPopulatingReplQueues()) {
+      if (set != null && !set.isEmpty() && blockManager.isPopulatingReplQueues()) {
         blockManager.postponeBlock(set.pollAll());
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ synchronized void register(final DatanodeDescriptor d) {`
`243`	`243`	`// remove blocks from invalidateBlocks by datanode.`
`244`	`244`	`blockManager.removeBlocksFromInvalidateBlocks(d);`
`245`	`245`	`// add blocks into postponed queue only when active NN is out of safe mode.`
`246`		`- if (!set.isEmpty() && blockManager.isPopulatingReplQueues()) {`
	`246`	`+ if (set != null && !set.isEmpty() && blockManager.isPopulatingReplQueues()) {`
`247`	`247`	`blockManager.postponeBlock(set.pollAll());`
`248`	`248`	`}`
`249`	`249`	`}`