Fix minor issues found during review

apache · Aug 27, 2024 · 9391c16 · 9391c16
1 parent e272751
commit 9391c16
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/...java/org/apache/hadoop/ozone/container/ec/reconstruction/ECReconstructionCoordinator.java b/...java/org/apache/hadoop/ozone/container/ec/reconstruction/ECReconstructionCoordinator.java
@@ -118,13 +118,13 @@ public class ECReconstructionCoordinator implements Closeable {
   private final OzoneClientConfig ozoneClientConfig;
 
   public ECReconstructionCoordinator(
-      ConfigurationSource conf, CertificateClient certClient,
+      ConfigurationSource conf, CertificateClient certificateClient,
       SecretKeySignerClient secretKeyClient, StateContext context,
       ECReconstructionMetrics metrics,
       String threadNamePrefix) throws IOException {
     this.context = context;
     this.containerOperationClient = new ECContainerOperationClient(conf,
-        certClient);
+        certificateClient);
     this.byteBufferPool = new ElasticByteBufferPool();
     ozoneClientConfig = conf.getObject(OzoneClientConfig.class);
     this.ecReconstructReadExecutor = createThreadPoolExecutor(

diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
@@ -35,7 +35,6 @@
 import org.apache.hadoop.hdds.scm.proxy.SCMClientConfig;
 import org.apache.hadoop.hdds.scm.proxy.SCMContainerLocationFailoverProxyProvider;
 import org.apache.hadoop.hdds.security.exception.SCMSecurityException;
-import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
 import org.apache.hadoop.hdds.tracing.TracingUtil;
 import org.apache.hadoop.hdds.utils.db.DBDefinition;
 import org.apache.hadoop.hdds.utils.db.DBColumnFamilyDefinition;
@@ -372,13 +371,6 @@ public static List<String> getExistingSstFiles(File db) throws IOException {
     return sstList;
   }
 
-  private static List<X509Certificate> generateCAList(CertificateClient certClient) {
-    List<X509Certificate> caCertPemList = new ArrayList<>(certClient.getAllRootCaCerts());
-    caCertPemList.addAll(certClient.getAllCaCerts());
-    return caCertPemList;
-  }
-
-
   /**
    * Retry forever until CA list matches expected count.
    * @param task - task to get CA list.

diff --git a/...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -1610,7 +1610,6 @@ private void persistSCMCertificates() throws IOException {
     // TODO: see if we can avoid doing this during every restart.
     if (primaryScmNodeId != null && !primaryScmNodeId.equals(
         scmStorageConfig.getScmId())) {
-      getScmSecurityClientWithMaxRetry(configuration, getCurrentUser());
       List<String> pemEncodedCerts =
           getScmSecurityClientWithMaxRetry(configuration, getCurrentUser()).listCACertificate();
       // Write the primary SCM CA and Root CA during startup.

diff --git a/...ration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java b/...ration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java
@@ -728,9 +728,9 @@ private void testECReconstructionCoordinator(List<Integer> missingIndexes,
           Pipeline p = containerToDeletePipeline.get(j);
           org.apache.hadoop.ozone.container.common.helpers.BlockData[]
               blockData = ecContainerOperationClient.listBlock(
-              conID, p.getFirstNode(),
-              (ECReplicationConfig) p.getReplicationConfig(),
-              cToken);
+                  conID, p.getFirstNode(),
+                  (ECReplicationConfig) p.getReplicationConfig(),
+                  cToken);
           blockDataArrList.add(blockData);
           // Delete the first index container
           XceiverClientSpi client = xceiverClientManager.acquireClient(