From 47d4d133bf3b2e5f97d3074770fcf016e8074774 Mon Sep 17 00:00:00 2001
From: Slava Tutrinov <vyacheslav.tutrinov@wandisco.com>
Date: Tue, 21 Jan 2025 14:16:44 +0300
Subject: [PATCH] HDDS-12080. fix rat and spotbugs issues (add exclusions)

---
 dev-support/rat/rat-exclusions.txt                   |  1 +
 .../dev-support/findbugsExcludeFile.xml              | 12 ++++++++++++
 .../ozone/container/ozoneimpl/OzoneContainer.java    |  8 +++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/dev-support/rat/rat-exclusions.txt b/dev-support/rat/rat-exclusions.txt
index 4531b1b601c..ab06a6f3c75 100644
--- a/dev-support/rat/rat-exclusions.txt
+++ b/dev-support/rat/rat-exclusions.txt
@@ -47,6 +47,7 @@ src/test/resources/additionalfields.container
 src/test/resources/incorrect.checksum.container
 src/test/resources/incorrect.container
 src/test/resources/test.db.ini
+src/test/resources/metadata/**
 
 # hadoop-hdds/docs
 **/themes/ozonedoc/**
diff --git a/hadoop-hdds/container-service/dev-support/findbugsExcludeFile.xml b/hadoop-hdds/container-service/dev-support/findbugsExcludeFile.xml
index f68fa91db86..ccc786c1fe1 100644
--- a/hadoop-hdds/container-service/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-hdds/container-service/dev-support/findbugsExcludeFile.xml
@@ -81,4 +81,16 @@
     <Class name="org.apache.hadoop.ozone.container.ozoneimpl.TestBackgroundContainerMetadataScanner"/>
     <Bug pattern="RU_INVOKE_RUN, RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" />
   </Match>
+  <Match>
+    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE">
+      <Class name="org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer"/>
+      <Method name="testCleanUpMetadataDirInCaseOfDeadNodeState"/>
+    </Bug>
+  </Match>
+  <Match>
+    <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT">
+      <Class name="org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer"/>
+      <Method name="testCleanUpMetadataDirInCaseOfDeadNodeState"/>
+    </Bug>
+  </Match>
 </FindBugsFilter>
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
index 240e09ab42d..ad02ce10c5d 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
@@ -677,7 +677,13 @@ public DatanodeDetails getDatanodeDetails() {
   private void cleanUpRatisMetadataDirectory()
       throws IOException {
     if (scmConnectionManager != null) {
-      Collection<InetSocketAddress> scmAddressesForDatanodes = HddsUtils.getSCMAddressForDatanodes(config);
+      Collection<InetSocketAddress> scmAddressesForDatanodes;
+      try {
+        scmAddressesForDatanodes = HddsUtils.getSCMAddressForDatanodes(config);
+      } catch (IllegalArgumentException e) {
+        LOG.error("Failed to get SCM addresses for datanodes: {}", e.getMessage());
+        return;
+      }
       for (InetSocketAddress scmAddress : scmAddressesForDatanodes) {
         scmConnectionManager.addSCMServer(scmAddress, context.getThreadNamePrefix());
         context.addEndpoint(scmAddress);