Skip to content

Commit 8e15cab

Browse files
committed
Fix checkstyle and findbugs issues
1 parent b375f2f commit 8e15cab

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.apache.hadoop.hdds.utils.IOUtils;
4747
import org.apache.hadoop.hdds.utils.NettyMetrics;
4848
import org.apache.hadoop.ozone.HddsDatanodeStopService;
49+
import org.apache.hadoop.ozone.OzoneSecurityUtil;
4950
import org.apache.hadoop.ozone.container.common.DatanodeLayoutStorage;
5051
import org.apache.hadoop.ozone.container.common.report.ReportManager;
5152
import org.apache.hadoop.ozone.container.common.statemachine.commandhandler.CloseContainerCommandHandler;
@@ -215,9 +216,12 @@ public DatanodeStateMachine(DatanodeDetails datanodeDetails,
215216
ReplicationSupervisorMetrics.create(supervisor);
216217

217218
ecReconstructionMetrics = ECReconstructionMetrics.create();
218-
certClient.createClientTrustManager();
219+
ClientTrustManager clientTrustManager = null;
220+
if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
221+
clientTrustManager = certClient.createClientTrustManager();
222+
}
219223
ecReconstructionCoordinator = new ECReconstructionCoordinator(
220-
conf, certClient.createClientTrustManager(), secretKeyClient, context, ecReconstructionMetrics,
224+
conf, clientTrustManager, secretKeyClient, context, ecReconstructionMetrics,
221225
threadNamePrefix);
222226

223227
// This is created as an instance variable as Mockito needs to access it in

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ec/reconstruction/ECContainerOperationClient.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,9 @@
2626
import org.apache.hadoop.hdds.scm.XceiverClientManager;
2727
import org.apache.hadoop.hdds.scm.XceiverClientSpi;
2828
import org.apache.hadoop.hdds.scm.client.ClientTrustManager;
29-
import org.apache.hadoop.hdds.security.x509.certificate.client.CACertificateProvider;
3029
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
3130
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
3231
import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
33-
import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
34-
import org.apache.hadoop.ozone.OzoneSecurityUtil;
3532
import org.apache.hadoop.ozone.container.common.helpers.BlockData;
3633
import org.apache.hadoop.security.token.Token;
3734
import org.apache.hadoop.security.token.TokenIdentifier;
@@ -42,8 +39,6 @@
4239

4340
import java.io.Closeable;
4441
import java.io.IOException;
45-
import java.security.cert.X509Certificate;
46-
import java.util.ArrayList;
4742
import java.util.List;
4843
import java.util.Objects;
4944
import java.util.Set;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ec/reconstruction/ECReconstructionCoordinator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.hadoop.hdds.security.SecurityConfig;
4040
import org.apache.hadoop.hdds.security.symmetric.SecretKeySignerClient;
4141
import org.apache.hadoop.hdds.security.token.ContainerTokenIdentifier;
42-
import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
4342
import org.apache.hadoop.hdds.utils.IOUtils;
4443
import org.apache.hadoop.io.ByteBufferPool;
4544
import org.apache.hadoop.io.ElasticByteBufferPool;

0 commit comments

Comments
 (0)