From cb7b6bcd1ad60f23a5d735ce776eefc59803f423 Mon Sep 17 00:00:00 2001
From: teamconfx <team.fuzzing@gmail.com>
Date: Mon, 11 Sep 2023 16:15:15 +0800
Subject: [PATCH] add a check for storageTypeStats not null

---
 .../server/blockmanagement/BlockPlacementPolicyDefault.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
index 60a2a8676adab..6cdab55fca897 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
@@ -1058,8 +1058,10 @@ private double getInServiceXceiverAverageByStorageType(
     int numXceiver = 0;
     for (StorageType s : storageTypes) {
       StorageTypeStats storageTypeStats = storageStats.get(s);
-      numNodes += storageTypeStats.getNodesInService();
-      numXceiver += storageTypeStats.getNodesInServiceXceiverCount();
+      if (storageTypeStats != null) {
+          numNodes += storageTypeStats.getNodesInService();
+          numXceiver += storageTypeStats.getNodesInServiceXceiverCount();
+      }
     }
     if (numNodes != 0) {
       avgLoad = (double) numXceiver / numNodes;