HDDS-12080. fix rat and spotbugs issues (add exclusions)

apache · Jan 23, 2025 · 47d4d13 · 47d4d13
1 parent 6d438f2
commit 47d4d13
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git 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
@@ -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/...ner-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java b/...ner-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);