From 173e7d26f5ec52644cdb83f08964ceb36f8598b0 Mon Sep 17 00:00:00 2001
From: Chung En Lee <wfps1210@gmail.com>
Date: Mon, 1 Jul 2024 00:23:26 +0800
Subject: [PATCH] HDDS-10508. OmUtils.getAllOMHAAddresses may throw NPE (#6884)
---
.../src/main/java/org/apache/hadoop/ozone/OmUtils.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
index 64aa9b1d24..6735c0a4f0 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
@@ -855,6 +855,12 @@ public static List<OMNodeDetails> getAllOMHAAddresses(OzoneConfiguration conf,
try {
OMNodeDetails omNodeDetails = OMNodeDetails.getOMNodeDetailsFromConf(
conf, omServiceId, nodeId);
+ if (omNodeDetails == null) {
+ LOG.error(
+ "There is no OM configuration for node ID {} in ozone-site.xml.",
+ nodeId);
+ continue;
+ }
if (decommissionedNodeIds.contains(omNodeDetails.getNodeId())) {
omNodeDetails.setDecommissioningState();
}
--
GitLab