From ccdd80508e74b2e9c86c69e393b3e1e5f5ea528d Mon Sep 17 00:00:00 2001 From: deveshsingh Date: Tue, 25 Jun 2024 12:50:26 +0530 Subject: [PATCH 1/2] HDDS-11045. Recon Decommissioning Info API throws NPE. --- .../java/org/apache/hadoop/hdds/client/DecommissionUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java index 7d5b610b0875..b469436b405b 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java @@ -126,7 +126,8 @@ public static Map getCountsMap(DatanodeDetails datanode, JsonNod Map countsMap, String errMsg) throws IOException { for (int i = 1; i <= numDecomNodes; i++) { - if (datanode.getHostName().equals(counts.get("tag.datanode." + i).asText())) { + String dNHostName = (counts.get("tag.datanode." + i) != null) ? (counts.get("tag.datanode." + i).asText()) : ""; + if (datanode.getHostName().equals(dNHostName)) { JsonNode pipelinesDN = counts.get("PipelinesWaitingToCloseDN." + i); JsonNode underReplicatedDN = counts.get("UnderReplicatedDN." + i); JsonNode unclosedDN = counts.get("UnclosedContainersDN." + i); From 87c36bcf8ffc9bb5b72f03aea8113a073d090e00 Mon Sep 17 00:00:00 2001 From: deveshsingh Date: Thu, 27 Jun 2024 09:44:29 +0530 Subject: [PATCH 2/2] HDDS-11045. Fixing review comments. --- .../org/apache/hadoop/hdds/client/DecommissionUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java index b469436b405b..c176ad1464ec 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java @@ -126,8 +126,9 @@ public static Map getCountsMap(DatanodeDetails datanode, JsonNod Map countsMap, String errMsg) throws IOException { for (int i = 1; i <= numDecomNodes; i++) { - String dNHostName = (counts.get("tag.datanode." + i) != null) ? (counts.get("tag.datanode." + i).asText()) : ""; - if (datanode.getHostName().equals(dNHostName)) { + String datanodeHostName = + (counts.get("tag.datanode." + i) != null) ? (counts.get("tag.datanode." + i).asText()) : ""; + if (datanode.getHostName().equals(datanodeHostName)) { JsonNode pipelinesDN = counts.get("PipelinesWaitingToCloseDN." + i); JsonNode underReplicatedDN = counts.get("UnderReplicatedDN." + i); JsonNode unclosedDN = counts.get("UnclosedContainersDN." + i);