You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by si...@apache.org on 2022/02/09 19:15:39 UTC
[ozone] branch master updated: HDDS-6208. New checkstyle: WhitespaceAround (#3003)
This is an automated email from the ASF dual-hosted git repository.
siyao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new de42c61 HDDS-6208. New checkstyle: WhitespaceAround (#3003)
de42c61 is described below
commit de42c614a88c9ca9a082c12625f3dff12508b648
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Wed Feb 9 11:15:08 2022 -0800
HDDS-6208. New checkstyle: WhitespaceAround (#3003)
---
.../apache/hadoop/hdds/scm/XceiverClientGrpc.java | 8 +--
.../hadoop/hdds/scm/client/HddsClientUtils.java | 4 +-
.../hadoop/hdds/scm/storage/BlockInputStream.java | 6 +--
.../hadoop/hdds/scm/storage/BlockOutputStream.java | 2 +-
.../apache/hadoop/hdds/scm/storage/BufferPool.java | 2 +-
.../hdds/scm/storage/RatisBlockOutputStream.java | 2 +-
.../org/apache/hadoop/hdds/HddsConfigKeys.java | 2 +-
.../java/org/apache/hadoop/hdds/HddsUtils.java | 2 +-
.../java/org/apache/hadoop/hdds/StringUtils.java | 2 +-
.../hadoop/hdds/annotation/InterfaceAudience.java | 6 +--
.../org/apache/hadoop/hdds/client/OzoneQuota.java | 2 +-
.../org/apache/hadoop/hdds/client/QuotaList.java | 11 ++--
.../hadoop/hdds/client/ReplicationFactor.java | 2 +-
.../hadoop/hdds/conf/OzoneConfiguration.java | 2 +-
.../hadoop/hdds/fs/CachingSpaceUsageSource.java | 2 +-
.../hadoop/hdds/protocol/DatanodeDetails.java | 4 +-
.../org/apache/hadoop/hdds/ratis/RatisHelper.java | 2 +-
.../org/apache/hadoop/hdds/recon/ReconConfig.java | 2 +-
.../hadoop/hdds/scm/ByteStringConversion.java | 2 +-
.../java/org/apache/hadoop/hdds/scm/ScmConfig.java | 2 +-
.../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 2 +-
.../scm/container/ReplicationManagerReport.java | 2 +-
.../apache/hadoop/hdds/scm/net/InnerNodeImpl.java | 14 ++---
.../hadoop/hdds/scm/net/NetworkTopologyImpl.java | 28 +++++-----
.../org/apache/hadoop/hdds/scm/net/NodeSchema.java | 4 +-
.../hadoop/hdds/scm/net/NodeSchemaLoader.java | 8 +--
.../apache/hadoop/hdds/scm/pipeline/Pipeline.java | 8 +--
.../hdds/scm/storage/ContainerProtocolCalls.java | 8 +--
.../apache/hadoop/hdds/utils/HddsVersionInfo.java | 2 +-
.../hadoop/hdds/utils/ResourceSemaphore.java | 10 ++--
.../org/apache/hadoop/hdds/utils/UniqueId.java | 2 +-
.../java/org/apache/hadoop/ozone/OzoneConsts.java | 10 ++--
.../hadoop/ozone/audit/AuditEventStatus.java | 2 +-
.../org/apache/hadoop/ozone/audit/AuditLogger.java | 4 +-
.../apache/hadoop/ozone/audit/AuditLoggerType.java | 2 +-
.../org/apache/hadoop/ozone/audit/AuditMarker.java | 4 +-
.../apache/hadoop/ozone/audit/AuditMessage.java | 10 ++--
.../hadoop/ozone/common/ChecksumByteBuffer.java | 2 +-
.../ozone/common/IncrementalChunkBuffer.java | 13 ++---
.../apache/hadoop/ozone/common/StorageInfo.java | 8 +--
.../ozone/common/ha/ratis/RatisSnapshotInfo.java | 2 +-
.../ozone/container/common/helpers/BlockData.java | 4 +-
.../helpers/ContainerCommandRequestPBHelper.java | 10 ++--
.../java/org/apache/hadoop/ozone/lease/Lease.java | 8 +--
.../hadoop/ozone/lease/LeaseCallbackExecutor.java | 2 +-
.../hadoop/ozone/util/ShutdownHookManager.java | 2 +-
.../java/org/apache/hadoop/hdds/TestHddsUtils.java | 4 +-
.../hadoop/hdds/client/TestReplicationConfig.java | 2 +-
.../java/org/apache/hadoop/hdds/fs/TestDU.java | 2 +-
.../ratis/TestContainerCommandRequestMessage.java | 6 +--
.../apache/hadoop/hdds/scm/ha/TestSCMNodeInfo.java | 4 +-
.../hdds/scm/net/TestNetworkTopologyImpl.java | 20 ++++----
.../hadoop/hdds/scm/pipeline/MockPipeline.java | 2 +-
.../hadoop/hdds/utils/MockGatheringChannel.java | 2 +-
.../hadoop/hdds/utils/TestResourceSemaphore.java | 6 +--
.../org/apache/hadoop/ozone/audit/DummyEntity.java | 2 +-
.../hadoop/ozone/audit/TestOzoneAuditLogger.java | 4 +-
.../apache/hadoop/ozone/common/TestChecksum.java | 2 +-
.../hadoop/ozone/common/TestChunkBuffer.java | 20 ++++----
.../hadoop/ozone/common/TestStateMachine.java | 4 +-
.../ozone/container/ContainerTestHelper.java | 2 +-
.../hadoop/ozone/lease/TestLeaseManager.java | 2 +-
.../apache/hadoop/ozone/HddsDatanodeService.java | 6 +--
.../container/common/helpers/ContainerMetrics.java | 6 +--
.../container/common/helpers/ContainerUtils.java | 2 +-
.../container/common/impl/HddsDispatcher.java | 15 +++---
.../common/impl/OpenContainerBlockMap.java | 2 +-
.../common/statemachine/DatanodeConfiguration.java | 2 +-
.../common/statemachine/DatanodeStateMachine.java | 8 +--
.../common/statemachine/StateContext.java | 12 ++---
.../commandhandler/CommandDispatcher.java | 2 +-
.../common/states/datanode/InitDatanodeState.java | 2 +-
.../states/endpoint/VersionEndpointTask.java | 2 +-
.../common/transport/server/ratis/CSMMetrics.java | 2 +-
.../server/ratis/ContainerStateMachine.java | 4 +-
.../transport/server/ratis/XceiverServerRatis.java | 4 +-
.../container/common/utils/HddsVolumeUtil.java | 2 +-
.../container/common/volume/MutableVolumeSet.java | 2 +-
.../container/common/volume/StorageVolume.java | 2 +-
.../ozone/container/common/volume/VolumeUsage.java | 2 +-
.../container/keyvalue/KeyValueContainer.java | 6 +--
.../container/keyvalue/KeyValueContainerCheck.java | 6 +--
.../container/keyvalue/KeyValueContainerData.java | 2 +-
.../ozone/container/keyvalue/KeyValueHandler.java | 6 +--
.../helpers/KeyValueContainerLocationUtil.java | 2 +-
.../container/keyvalue/impl/BlockManagerImpl.java | 8 +--
.../background/BlockDeletingService.java | 4 +-
.../container/metadata/AbstractDatanodeStore.java | 2 +-
.../ozoneimpl/ContainerDataScrubberMetrics.java | 6 +--
.../ozoneimpl/ContainerMetadataScanner.java | 2 +-
.../ContainerMetadataScrubberMetrics.java | 2 +-
.../replication/GrpcReplicationClient.java | 2 +-
.../container/stream/DirstreamClientHandler.java | 2 +-
.../upgrade/DataNodeUpgradeFinalizer.java | 2 +-
.../upgrade/VersionedDatanodeFeatures.java | 2 +-
.../ozone/protocol/commands/ReregisterCommand.java | 2 +-
.../hadoop/ozone/TestHddsSecureDatanodeInit.java | 2 +-
.../hadoop/ozone/container/common/ScmTestMock.java | 35 +++++++------
.../container/common/TestBlockDeletingService.java | 7 +--
.../ozone/container/common/TestContainerCache.java | 2 +-
.../TestSchemaOneBackwardsCompatibility.java | 36 ++++++++-----
.../container/common/helpers/TestBlockData.java | 6 +--
.../common/helpers/TestDatanodeVersionFile.java | 10 ++--
.../common/impl/TestContainerDataYaml.java | 2 +-
.../container/common/impl/TestContainerSet.java | 12 ++---
.../container/common/impl/TestHddsDispatcher.java | 2 +-
.../container/common/interfaces/TestHandler.java | 2 +-
.../common/report/TestReportPublisher.java | 2 +-
.../TestCloseContainerCommandHandler.java | 4 +-
.../volume/TestRoundRobinVolumeChoosingPolicy.java | 2 +-
.../container/common/volume/TestVolumeSet.java | 2 +-
.../keyvalue/TestKeyValueBlockIterator.java | 14 ++---
.../container/keyvalue/TestKeyValueContainer.java | 2 +-
.../keyvalue/TestKeyValueContainerCheck.java | 2 +-
.../container/keyvalue/TestKeyValueHandler.java | 4 +-
.../keyvalue/impl/CommonChunkManagerTestCases.java | 4 +-
.../container/ozoneimpl/TestContainerReader.java | 8 +--
.../replication/TestGrpcOutputStream.java | 8 +--
.../replication/TestReplicationSupervisor.java | 2 +-
.../upgrade/TestDatanodeUpgradeToScmHA.java | 6 +--
hadoop-hdds/dev-support/checkstyle/checkstyle.xml | 1 +
.../SCMSecurityProtocolClientSideTranslatorPB.java | 2 +-
...inerLocationProtocolClientSideTranslatorPB.java | 4 +-
.../scm/update/client/CRLClientUpdateHandler.java | 2 +-
.../hdds/scm/update/client/ClientCRLStore.java | 4 +-
.../update/client/SCMUpdateServiceGrpcClient.java | 2 +-
.../x509/certificate/authority/BaseApprover.java | 2 +-
.../certificate/authority/DefaultCAServer.java | 6 +--
.../authority/PKIProfiles/DefaultCAProfile.java | 2 +-
.../client/DefaultCertificateClient.java | 32 ++++++------
.../certificate/client/OMCertificateClient.java | 4 +-
.../certificates/utils/CertificateSignRequest.java | 10 ++--
.../hadoop/hdds/security/x509/crl/CRLInfo.java | 2 +-
.../hdds/security/x509/crl/CRLInfoCodec.java | 2 +-
.../hadoop/hdds/server/http/ProfileServlet.java | 2 +-
.../hadoop/hdds/utils/DBCheckpointMetrics.java | 2 +-
.../java/org/apache/hadoop/hdds/utils/HAUtils.java | 2 +-
.../hadoop/hdds/utils/MetadataKeyFilters.java | 2 +-
.../apache/hadoop/hdds/utils/TransactionInfo.java | 2 +-
.../hadoop/hdds/utils/db/DBConfigFromFile.java | 4 +-
.../hadoop/hdds/utils/db/DBStoreBuilder.java | 4 +-
.../apache/hadoop/hdds/utils/db/TypedTable.java | 2 +-
.../hadoop/hdds/utils/db/cache/CacheKey.java | 2 +-
.../hadoop/hdds/utils/db/cache/EpochEntry.java | 2 +-
.../x509/certificate/authority/MockCAStore.java | 2 +-
.../x509/certificate/utils/TestCRLCodec.java | 2 +-
.../certificates/TestCertificateSignRequest.java | 4 +-
.../x509/certificates/TestRootCertificate.java | 2 +-
.../security/x509/keys/TestHDDSKeyGenerator.java | 2 +-
.../hadoop/hdds/utils/db/TestDBStoreBuilder.java | 10 ++--
.../apache/hadoop/hdds/utils/db/TestRDBStore.java | 4 +-
.../hadoop/hdds/utils/db/TestRDBStoreIterator.java | 6 +--
.../hadoop/hdds/utils/db/TestRDBTableStore.java | 4 +-
.../hdds/utils/db/TestTypedRDBTableStore.java | 2 +-
.../hadoop/hdds/utils/db/cache/TestTableCache.java | 20 ++++----
.../hadoop/hdds/scm/block/DeletedBlockLogImpl.java | 2 +-
.../hdds/scm/container/ContainerReplicaCount.java | 18 +++----
.../hdds/scm/container/ContainerReportHandler.java | 2 +-
.../hdds/scm/container/ReplicationManager.java | 24 ++++-----
.../balancer/AbstractFindTargetGreedy.java | 6 +--
.../scm/container/balancer/ContainerBalancer.java | 2 +-
.../balancer/ContainerBalancerConfiguration.java | 4 +-
.../scm/container/balancer/FindSourceGreedy.java | 6 +--
.../ContainerPlacementPolicyFactory.java | 2 +-
.../algorithms/SCMContainerPlacementMetrics.java | 2 +-
.../algorithms/SCMContainerPlacementRackAware.java | 12 ++---
.../container/placement/metrics/SCMMetrics.java | 2 +-
.../scm/container/states/ContainerStateMap.java | 2 +-
.../apache/hadoop/hdds/scm/ha/HASecurityUtils.java | 2 +-
.../org/apache/hadoop/hdds/scm/ha/RatisUtil.java | 2 +-
.../hadoop/hdds/scm/ha/SCMHAInvocationHandler.java | 4 +-
.../apache/hadoop/hdds/scm/ha/io/CodecFactory.java | 2 +-
.../hdds/scm/metadata/SCMMetadataStoreImpl.java | 4 +-
.../hdds/scm/metadata/X509CertificateCodec.java | 2 +-
.../apache/hadoop/hdds/scm/node/CommandQueue.java | 2 +-
.../hdds/scm/node/NodeDecommissionManager.java | 32 ++++++------
.../apache/hadoop/hdds/scm/node/NodeManager.java | 2 +-
.../hadoop/hdds/scm/node/NodeStateManager.java | 2 +-
.../apache/hadoop/hdds/scm/node/NodeStatus.java | 4 +-
.../hadoop/hdds/scm/node/SCMNodeManager.java | 8 +--
.../hadoop/hdds/scm/node/SCMNodeMetrics.java | 8 +--
.../hdds/scm/node/SCMNodeStorageStatMap.java | 2 +-
.../hdds/scm/node/states/Node2ObjectsMap.java | 2 +-
.../hadoop/hdds/scm/node/states/NodeStateMap.java | 2 +-
.../hdds/scm/pipeline/PipelineManagerImpl.java | 2 +-
.../hdds/scm/pipeline/PipelineReportHandler.java | 4 +-
.../hdds/scm/pipeline/RatisPipelineUtils.java | 2 +-
.../scm/pipeline/WritableContainerFactory.java | 2 +-
...inerLocationProtocolServerSideTranslatorPB.java | 8 +--
.../hdds/scm/safemode/ContainerSafeModeRule.java | 4 +-
.../hdds/scm/safemode/DataNodeSafeModeRule.java | 2 +-
.../hdds/scm/server/SCMBlockProtocolServer.java | 16 +++---
.../hdds/scm/server/SCMClientProtocolServer.java | 15 +++---
.../hdds/scm/server/SCMDatanodeProtocolServer.java | 6 +--
.../hdds/scm/server/StorageContainerManager.java | 12 ++---
.../scm/server/StorageContainerManagerStarter.java | 2 +-
.../org/apache/hadoop/hdds/scm/HddsTestUtils.java | 2 +-
.../apache/hadoop/hdds/scm/TestHddsServerUtil.java | 2 +-
.../hadoop/hdds/scm/TestHddsServerUtils.java | 2 +-
.../hadoop/hdds/scm/block/TestBlockManager.java | 4 +-
.../hadoop/hdds/scm/container/MockNodeManager.java | 6 +--
.../hdds/scm/container/SimpleMockNodeManager.java | 2 +-
.../scm/container/TestContainerManagerImpl.java | 6 +--
.../TestIncrementalContainerReportHandler.java | 4 +-
.../container/balancer/TestContainerBalancer.java | 24 ++++-----
.../TestSCMContainerPlacementRackAware.java | 2 +-
.../hadoop/hdds/scm/ha/TestSCMHAConfiguration.java | 26 +++++-----
.../hadoop/hdds/scm/ha/TestSCMRatisRequest.java | 2 +-
.../hdds/scm/metadata/TestPipelineIDCodec.java | 2 +-
.../hdds/scm/node/TestContainerPlacement.java | 2 +-
.../hdds/scm/node/TestDatanodeAdminMonitor.java | 4 +-
.../hdds/scm/node/TestNodeDecommissionManager.java | 12 ++---
.../hadoop/hdds/scm/node/TestNodeStateManager.java | 2 +-
.../hadoop/hdds/scm/node/TestSCMNodeManager.java | 4 +-
.../hdds/scm/node/states/TestNodeStateMap.java | 4 +-
.../TestPipelineDatanodesIntersection.java | 4 +-
.../scm/pipeline/TestPipelinePlacementPolicy.java | 16 +++---
.../scm/pipeline/TestRatisPipelineProvider.java | 4 +-
.../TestOneReplicaPipelineSafeModeRule.java | 8 +--
.../hdds/scm/safemode/TestSCMSafeModeManager.java | 8 +--
.../hadoop/hdds/scm/server/TestSCMCertStore.java | 6 +--
.../server/TestSCMUpdateServiceGrpcServer.java | 24 ++++-----
.../scm/upgrade/TestScmStartupSlvLessThanMlv.java | 2 +-
.../testutils/ReplicationNodeManagerMock.java | 2 +-
.../org/apache/ozone/test/LambdaTestUtils.java | 4 +-
.../scm/cli/ContainerBalancerStatusSubcommand.java | 2 +-
.../cli/ReplicationManagerStatusSubcommand.java | 2 +-
.../hdds/scm/cli/SafeModeCheckSubcommand.java | 2 +-
.../hdds/scm/cli/SafeModeExitSubcommand.java | 2 +-
.../scm/cli/datanode/DecommissionSubCommand.java | 2 +-
.../scm/cli/datanode/MaintenanceSubCommand.java | 4 +-
.../scm/cli/datanode/RecommissionSubCommand.java | 2 +-
.../scm/cli/container/TestReportSubCommand.java | 12 ++---
.../scm/cli/datanode/TestListInfoSubcommand.java | 6 +--
.../apache/hadoop/ozone/client/ObjectStore.java | 6 +--
.../apache/hadoop/ozone/client/OzoneBucket.java | 12 ++---
.../hadoop/ozone/client/OzoneClientFactory.java | 2 +-
.../org/apache/hadoop/ozone/client/OzoneKey.java | 2 +-
.../apache/hadoop/ozone/client/OzoneVolume.java | 2 +-
.../ozone/client/io/BlockOutputStreamEntry.java | 6 +--
.../hadoop/ozone/client/rpc/OzoneKMSUtil.java | 4 +-
.../apache/hadoop/ozone/client/rpc/RpcClient.java | 24 ++++-----
.../hadoop/ozone/client/TestHddsClientUtils.java | 4 +-
.../main/java/org/apache/hadoop/ozone/OmUtils.java | 4 +-
.../java/org/apache/hadoop/ozone/OzoneAcl.java | 8 +--
.../org/apache/hadoop/ozone/om/OMConfigKeys.java | 6 +--
.../hadoop/ozone/om/helpers/OmBucketArgs.java | 10 ++--
.../apache/hadoop/ozone/om/helpers/OmKeyInfo.java | 2 +-
.../hadoop/ozone/om/helpers/OmKeyLocationInfo.java | 2 +-
.../ozone/om/helpers/OmKeyLocationInfoGroup.java | 4 +-
.../hadoop/ozone/om/helpers/OmVolumeArgs.java | 2 +-
.../hadoop/ozone/om/helpers/OzoneAclUtil.java | 4 +-
.../hadoop/ozone/om/helpers/OzoneFSUtils.java | 2 +-
.../hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java | 6 +--
.../hadoop/ozone/om/helpers/ServiceInfo.java | 2 +-
.../hadoop/ozone/om/helpers/WithObjectID.java | 2 +-
...OzoneManagerProtocolClientSideTranslatorPB.java | 8 +--
.../apache/hadoop/ozone/protocolPB/OMPBHelper.java | 14 ++---
.../hadoop/ozone/security/acl/OzoneObjInfo.java | 2 +-
.../apache/hadoop/ozone/util/OzoneVersionInfo.java | 2 +-
.../org/apache/hadoop/ozone/util/RadixTree.java | 2 +-
.../ozone/om/ha/TestOMFailoverProxyProvider.java | 2 +-
.../hadoop/ozone/om/lock/TestOzoneManagerLock.java | 2 +-
.../ozone/security/TestGDPRSymmetricKey.java | 2 +-
.../ozone/security/acl/TestOzoneObjInfo.java | 4 +-
.../apache/hadoop/ozone/util/TestRadixTree.java | 4 +-
hadoop-ozone/dev-support/checks/checkstyle.sh | 3 ++
.../apache/hadoop/ozone/MiniOzoneChaosCluster.java | 10 ++--
.../hadoop/ozone/MiniOzoneLoadGenerator.java | 2 +-
.../hadoop/ozone/loadgenerators/LoadBucket.java | 2 +-
.../fs/ozone/TestOzoneFSWithObjectStoreCreate.java | 14 ++---
.../hadoop/fs/ozone/TestOzoneFileInterfaces.java | 2 +-
.../hadoop/fs/ozone/TestOzoneFileSystem.java | 42 +++++++--------
.../apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java | 4 +-
.../hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 34 ++++++------
.../fs/ozone/contract/ITestOzoneContractUtils.java | 4 +-
.../hadoop/fs/ozone/contract/OzoneContract.java | 4 +-
.../hdds/scm/pipeline/TestLeaderChoosePolicy.java | 2 +-
.../hdds/scm/pipeline/TestMultiRaftSetup.java | 2 +-
.../TestRatisPipelineCreateAndDestroy.java | 2 +-
.../safemode/TestSCMSafeModeWithPipelineRules.java | 6 +--
.../hadoop/hdds/upgrade/TestHDDSUpgrade.java | 6 +--
.../apache/hadoop/ozone/MiniOzoneClusterImpl.java | 2 +-
.../hadoop/ozone/MiniOzoneClusterProvider.java | 4 +-
.../hadoop/ozone/MiniOzoneHAClusterImpl.java | 4 +-
.../org/apache/hadoop/ozone/OzoneTestUtils.java | 2 +-
.../ozone/TestContainerBalancerOperations.java | 4 +-
.../hadoop/ozone/TestContainerOperations.java | 2 +-
.../apache/hadoop/ozone/TestMiniOzoneCluster.java | 6 +--
.../hadoop/ozone/TestSecureOzoneCluster.java | 2 +-
.../ozone/client/CertificateClientTestImpl.java | 4 +-
.../hadoop/ozone/client/rpc/TestCommitWatcher.java | 2 +-
.../client/rpc/TestDiscardPreallocatedBlocks.java | 2 +-
.../client/rpc/TestFailureHandlingByClient.java | 2 +-
.../client/rpc/TestOzoneAtRestEncryption.java | 10 ++--
.../rpc/TestOzoneClientMultipartUploadWithFSO.java | 10 ++--
.../rpc/TestOzoneClientRetriesOnExceptions.java | 4 +-
.../client/rpc/TestOzoneRpcClientAbstract.java | 60 +++++++++++-----------
.../rpc/TestOzoneRpcClientForAclAuditLog.java | 18 +++----
.../TestOzoneRpcClientWithKeyLatestVersion.java | 2 +-
.../hadoop/ozone/client/rpc/TestReadRetries.java | 2 +-
.../ozone/client/rpc/TestSecureOzoneRpcClient.java | 6 +--
.../ozone/client/rpc/TestWatchForCommit.java | 2 +-
.../ozone/client/rpc/read/TestInputStreamBase.java | 2 +-
.../ozone/client/rpc/read/TestKeyInputStream.java | 8 +--
.../TestCloseContainerByPipeline.java | 2 +-
.../commandhandler/TestDeleteContainerHandler.java | 2 +-
.../container/metrics/TestContainerMetrics.java | 4 +-
.../container/ozoneimpl/TestOzoneContainer.java | 2 +-
.../container/server/TestContainerServer.java | 2 +-
.../server/TestSecureContainerServer.java | 6 +--
.../TestDatanodeHddsVolumeFailureDetection.java | 2 +-
.../ozone/freon/TestHadoopNestedDirGenerator.java | 26 +++++-----
.../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 4 +-
.../org/apache/hadoop/ozone/om/TestOmLDBCli.java | 14 ++---
.../org/apache/hadoop/ozone/om/TestOmMetrics.java | 2 +-
.../ozone/om/TestOmStartupSlvLessThanMlv.java | 2 +-
.../ozone/om/TestOzoneManagerConfiguration.java | 4 +-
.../hadoop/ozone/om/TestOzoneManagerHAWithACL.java | 8 +--
.../ozone/om/TestOzoneManagerHAWithData.java | 2 +-
.../ozone/om/TestOzoneManagerRestInterface.java | 2 +-
.../hadoop/ozone/recon/TestReconScmSnapshot.java | 2 +-
.../ozone/recon/TestReconWithOzoneManager.java | 6 +--
.../ozone/recon/TestReconWithOzoneManagerFSO.java | 8 +--
.../hadoop/ozone/scm/TestAllocateContainer.java | 2 +-
.../hadoop/ozone/scm/TestCloseContainer.java | 4 +-
.../org/apache/hadoop/ozone/scm/TestSCMMXBean.java | 6 +--
.../hadoop/ozone/scm/TestXceiverClientGrpc.java | 10 ++--
.../scm/node/TestDecommissionAndMaintenance.java | 18 +++----
.../hadoop/ozone/scm/node/TestQueryNode.java | 2 +-
.../hadoop/ozone/shell/TestOzoneShellHA.java | 12 ++---
.../hadoop/ozone/om/helpers/TestOmPrefixInfo.java | 2 +-
.../apache/hadoop/ozone/om/BucketManagerImpl.java | 2 +-
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 10 ++--
.../java/org/apache/hadoop/ozone/om/OMMetrics.java | 8 +--
.../hadoop/ozone/om/OmMetadataManagerImpl.java | 8 +--
.../org/apache/hadoop/ozone/om/OzoneAclUtils.java | 2 +-
.../org/apache/hadoop/ozone/om/OzoneManager.java | 12 ++---
.../hadoop/ozone/om/OzoneManagerPrepareState.java | 4 +-
.../hadoop/ozone/om/OzoneManagerStarter.java | 2 +-
.../hadoop/ozone/om/S3SecretManagerImpl.java | 2 +-
.../hadoop/ozone/om/TrashOzoneFileSystem.java | 12 ++---
.../apache/hadoop/ozone/om/TrashPolicyOzone.java | 12 ++---
.../ozone/om/ratis/OzoneManagerDoubleBuffer.java | 4 +-
.../ozone/om/ratis/OzoneManagerStateMachine.java | 6 +--
.../hadoop/ozone/om/request/OMClientRequest.java | 6 +--
.../om/request/bucket/OMBucketCreateRequest.java | 6 +--
.../request/bucket/OMBucketSetPropertyRequest.java | 6 +--
.../request/bucket/acl/OMBucketSetAclRequest.java | 2 +-
.../om/request/file/OMDirectoryCreateRequest.java | 2 +-
.../ozone/om/request/file/OMFileCreateRequest.java | 2 +-
.../ozone/om/request/file/OMFileRequest.java | 10 ++--
.../ozone/om/request/key/OMKeyCommitRequest.java | 4 +-
.../ozone/om/request/key/OMKeyCreateRequest.java | 2 +-
.../ozone/om/request/key/OMKeyRenameRequest.java | 2 +-
.../om/request/key/OMKeyRenameRequestWithFSO.java | 2 +-
.../hadoop/ozone/om/request/key/OMKeyRequest.java | 8 +--
.../ozone/om/request/key/acl/OMKeyAclRequest.java | 3 +-
.../multipart/S3MultipartUploadAbortRequest.java | 2 +-
.../om/request/volume/OMVolumeSetQuotaRequest.java | 6 +--
.../om/request/volume/acl/OMVolumeAclRequest.java | 2 +-
.../request/volume/acl/OMVolumeAddAclRequest.java | 2 +-
.../volume/acl/OMVolumeRemoveAclRequest.java | 2 +-
.../request/volume/acl/OMVolumeSetAclRequest.java | 2 +-
.../OzoneDelegationTokenSecretManager.java | 2 +-
.../hadoop/ozone/security/OzoneSecretStore.java | 4 +-
.../apache/hadoop/ozone/om/TestKeyManagerUnit.java | 2 +-
.../apache/hadoop/ozone/om/TestOMDBDefinition.java | 2 +-
.../hadoop/ozone/om/TestOmMetadataManager.java | 14 ++---
.../hadoop/ozone/om/failover/TestOMFailovers.java | 2 +-
...tOzoneManagerDoubleBufferWithDummyResponse.java | 2 +-
...TestOzoneManagerDoubleBufferWithOMResponse.java | 4 +-
.../om/ratis/TestOzoneManagerRatisServer.java | 2 +-
.../om/ratis/TestOzoneManagerStateMachine.java | 2 +-
.../request/file/TestOMDirectoryCreateRequest.java | 2 +-
.../om/request/file/TestOMFileCreateRequest.java | 6 +--
.../om/request/key/TestOMKeyCommitRequest.java | 4 +-
.../request/key/TestOMKeyCommitRequestWithFSO.java | 2 +-
.../om/request/key/TestOMKeyCreateRequest.java | 2 +-
.../request/key/TestOMKeyDeleteRequestWithFSO.java | 4 +-
.../key/TestOMKeyPurgeRequestAndResponse.java | 2 +-
.../request/key/TestOMOpenKeysDeleteRequest.java | 2 +-
.../TestS3MultipartUploadCompleteRequest.java | 2 +-
.../request/volume/TestOMVolumeCreateRequest.java | 2 +-
.../volume/TestOMVolumeSetQuotaRequest.java | 2 +-
.../ozone/om/response/TestCleanupTableInfo.java | 4 +-
.../ozone/om/upgrade/TestOMUpgradeFinalizer.java | 2 +-
.../om/upgrade/TestOzoneManagerPrepareState.java | 2 +-
.../TestOzoneDelegationTokenSecretManager.java | 6 +--
.../ozone/security/TestOzoneTokenIdentifier.java | 6 +--
.../security/acl/TestOzoneNativeAuthorizer.java | 6 +--
.../hadoop/ozone/security/acl/TestVolumeOwner.java | 4 +-
.../fs/ozone/BasicOzoneClientAdapterImpl.java | 2 +-
.../hadoop/fs/ozone/BasicOzoneFileSystem.java | 4 +-
.../apache/hadoop/fs/ozone/OzoneClientUtils.java | 2 +-
.../apache/hadoop/fs/ozone/OzoneFSInputStream.java | 2 +-
.../org/hadoop/ozone/recon/codegen/SqlDbUtils.java | 4 +-
.../ozone/recon/api/MetricsProxyEndpoint.java | 4 +-
.../hadoop/ozone/recon/api/NSSummaryEndpoint.java | 2 +-
.../hadoop/ozone/recon/api/PipelineEndpoint.java | 2 +-
.../hadoop/ozone/recon/codec/NSSummaryCodec.java | 2 +-
.../ozone/recon/fsck/ContainerHealthTask.java | 4 +-
.../ozone/recon/scm/ReconContainerManager.java | 4 +-
.../ozone/recon/scm/ReconPipelineFactory.java | 2 +-
.../scm/ReconStorageContainerManagerFacade.java | 4 +-
.../recon/spi/impl/ContainerKeyPrefixCodec.java | 2 +-
.../spi/impl/OzoneManagerServiceProviderImpl.java | 4 +-
.../ozone/recon/tasks/FileSizeCountTask.java | 4 +-
.../hadoop/ozone/recon/tasks/TableCountTask.java | 2 +-
.../ozone/recon/api/TestTaskStatusService.java | 2 +-
.../ozone/recon/fsck/TestContainerHealthTask.java | 2 +-
.../TestUtilizationSchemaDefinition.java | 2 +-
.../impl/TestOzoneManagerServiceProviderImpl.java | 4 +-
.../recon/tasks/TestContainerKeyMapperTask.java | 2 +-
.../ozone/recon/tasks/TestOMDBUpdatesHandler.java | 4 +-
.../ozone/recon/tasks/TestTableCountTask.java | 2 +-
.../hadoop/ozone/s3/VirtualHostStyleFilter.java | 8 +--
.../hadoop/ozone/s3/endpoint/BucketEndpoint.java | 4 +-
.../hadoop/ozone/s3/endpoint/EndpointBase.java | 2 +-
.../hadoop/ozone/s3/endpoint/ObjectEndpoint.java | 6 +--
.../org/apache/hadoop/ozone/s3/endpoint/S3Acl.java | 6 +--
.../hadoop/ozone/s3/endpoint/S3BucketAcl.java | 4 +-
.../hadoop/ozone/s3/signature/Credential.java | 2 +-
.../ozone/s3/TestVirtualHostStyleFilter.java | 2 +-
.../s3/commontypes/TestObjectKeyNameAdapter.java | 2 +-
.../hadoop/ozone/s3/endpoint/TestRootList.java | 2 +-
.../ozone/admin/om/FinalizeUpgradeSubCommand.java | 6 +--
.../admin/scm/FinalizeScmUpgradeSubcommand.java | 6 +--
.../admin/scm/FinalizeUpgradeCommandUtil.java | 4 +-
.../hadoop/ozone/audit/parser/AuditParser.java | 2 +-
.../ozone/audit/parser/common/DatabaseHelper.java | 16 +++---
.../parser/handler/TemplateCommandHandler.java | 2 +-
.../ozone/audit/parser/model/AuditEntry.java | 22 ++++----
.../apache/hadoop/ozone/debug/ChunkKeyHandler.java | 6 +--
.../org/apache/hadoop/ozone/debug/DBScanner.java | 8 +--
.../apache/hadoop/ozone/debug/PrefixParser.java | 2 +-
.../apache/hadoop/ozone/debug/ReadReplicas.java | 14 ++---
.../hadoop/ozone/freon/BaseFreonGenerator.java | 2 +-
.../hadoop/ozone/freon/DatanodeChunkGenerator.java | 12 ++---
.../hadoop/ozone/freon/HadoopDirTreeGenerator.java | 2 +-
.../GenerateOzoneRequiredConfigurations.java | 2 +-
.../apache/hadoop/ozone/shell/OzoneAddress.java | 4 +-
.../ozone/shell/bucket/CreateBucketHandler.java | 2 +-
.../hadoop/ozone/audit/parser/TestAuditParser.java | 2 +-
.../hadoop/ozone/conf/TestGetConfOptions.java | 4 +-
.../TestGenerateOzoneRequiredConfigurations.java | 4 +-
.../org/apache/hadoop/test/OzoneTestDriver.java | 6 +--
447 files changed, 1186 insertions(+), 1163 deletions(-)
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
index f19853c..a268495 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
@@ -159,7 +159,7 @@ public class XceiverClientGrpc extends XceiverClientSpi {
private synchronized void connectToDatanode(DatanodeDetails dn)
throws IOException {
- if (isConnected(dn)){
+ if (isConnected(dn)) {
return;
}
// read port from the data node, on failure use default configured
@@ -269,10 +269,10 @@ public class XceiverClientGrpc extends XceiverClientSpi {
Thread.currentThread().interrupt();
}
}
- try{
+ try {
for (Map.Entry<DatanodeDetails,
CompletableFuture<ContainerCommandResponseProto> >
- entry : futureHashMap.entrySet()){
+ entry : futureHashMap.entrySet()) {
responseProtoHashMap.put(entry.getKey(), entry.getValue().get());
}
} catch (InterruptedException e) {
@@ -538,7 +538,7 @@ public class XceiverClientGrpc extends XceiverClientSpi {
}
private synchronized void checkOpen(DatanodeDetails dn)
- throws IOException{
+ throws IOException {
if (closed) {
throw new IOException("This channel is not connected.");
}
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/client/HddsClientUtils.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/client/HddsClientUtils.java
index 6b74adb..07fd0a8 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/client/HddsClientUtils.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/client/HddsClientUtils.java
@@ -206,8 +206,8 @@ public final class HddsClientUtils {
if (keyName == null) {
throw new IllegalArgumentException("Key name is null");
}
- if(!OzoneConsts.KEYNAME_ILLEGAL_CHARACTER_CHECK_REGEX
- .matcher(keyName).matches()){
+ if (!OzoneConsts.KEYNAME_ILLEGAL_CHARACTER_CHECK_REGEX
+ .matcher(keyName).matches()) {
throw new IllegalArgumentException("Invalid key name: " + keyName);
}
}
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
index e4500bc..bd97cf2 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
@@ -152,7 +152,7 @@ public class BlockInputStream extends InputStream
// retry according to retry policy.
chunks = getChunkInfos();
break;
- } catch(SCMSecurityException ex) {
+ } catch (SCMSecurityException ex) {
throw ex;
} catch (StorageContainerException ex) {
refreshPipeline(ex);
@@ -340,9 +340,9 @@ public class BlockInputStream extends InputStream
} else {
throw e;
}
- } catch(SCMSecurityException ex) {
+ } catch (SCMSecurityException ex) {
throw ex;
- } catch(IOException ex) {
+ } catch (IOException ex) {
// We got a IOException which might be due
// to DN down or connectivity issue.
if (shouldRetryRead(ex)) {
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
index 150c418..8b3f817 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
@@ -708,7 +708,7 @@ public class BlockOutputStream extends OutputStream {
boolean processExecutionException)
throws IOException {
LOG.error("Command execution was interrupted.");
- if(processExecutionException) {
+ if (processExecutionException) {
handleExecutionException(ex);
} else {
throw new IOException(EXCEPTION_MSG + ex.toString(), ex);
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BufferPool.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BufferPool.java
index 94fa87a..a520f8a 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BufferPool.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BufferPool.java
@@ -46,7 +46,7 @@ public class BufferPool {
}
public BufferPool(int bufferSize, int capacity,
- Function<ByteBuffer, ByteString> byteStringConversion){
+ Function<ByteBuffer, ByteString> byteStringConversion) {
this.capacity = capacity;
this.bufferSize = bufferSize;
bufferList = new ArrayList<>(capacity);
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/RatisBlockOutputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/RatisBlockOutputStream.java
index 7238f2a..802adc1 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/RatisBlockOutputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/RatisBlockOutputStream.java
@@ -97,7 +97,7 @@ public class RatisBlockOutputStream extends BlockOutputStream {
@Override
XceiverClientReply sendWatchForCommit(boolean bufferFull) throws IOException {
- return bufferFull? commitWatcher.watchOnFirstIndex()
+ return bufferFull ? commitWatcher.watchOnFirstIndex()
: commitWatcher.watchOnLastIndex();
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
index f538595..d1e3c19 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
@@ -151,7 +151,7 @@ public final class HddsConfigKeys {
*/
public static final String HDDS_X509_MAX_DURATION = "hdds.x509.max.duration";
// Limit Certificate duration to a max value of 5 years.
- public static final String HDDS_X509_MAX_DURATION_DEFAULT= "P1865D";
+ public static final String HDDS_X509_MAX_DURATION_DEFAULT = "P1865D";
public static final String HDDS_X509_SIGNATURE_ALGO =
"hdds.x509.signature.algorithm";
public static final String HDDS_X509_SIGNATURE_ALGO_DEFAULT = "SHA256withRSA";
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
index 5abe8fb..ffbb3e3 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
@@ -632,7 +632,7 @@ public final class HddsUtils {
* Utility method to round up bytes into the nearest MB.
*/
public static int roundupMb(long bytes) {
- return (int)Math.ceil((double) bytes/(double) ONE_MB);
+ return (int)Math.ceil((double) bytes / (double) ONE_MB);
}
/**
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/StringUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/StringUtils.java
index 77d1930..792a9d0 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/StringUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/StringUtils.java
@@ -151,6 +151,6 @@ public final class StringUtils {
public static String appendIfNotPresent(String str, char c) {
Preconditions.checkNotNull(str, "Input string is null");
- return str.isEmpty() || str.charAt(str.length() - 1) != c ? str + c: str;
+ return str.isEmpty() || str.charAt(str.length() - 1) != c ? str + c : str;
}
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/annotation/InterfaceAudience.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/annotation/InterfaceAudience.java
index 37da0a3..03dc005 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/annotation/InterfaceAudience.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/annotation/InterfaceAudience.java
@@ -50,7 +50,7 @@ public final class InterfaceAudience {
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
- public @interface Public {};
+ public @interface Public { };
/**
* Intended only for the project(s) specified in the annotation.
@@ -67,7 +67,7 @@ public final class InterfaceAudience {
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
- public @interface Private {};
+ public @interface Private { };
- private InterfaceAudience() {} // Audience can't exist on its own
+ private InterfaceAudience() { } // Audience can't exist on its own
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/OzoneQuota.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/OzoneQuota.java
index 9945690..794ebd2 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/OzoneQuota.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/OzoneQuota.java
@@ -43,7 +43,7 @@ public final class OzoneQuota {
public static final String OZONE_QUOTA_TB = "TB";
/** Quota Units.*/
- public enum Units {B, KB, MB, GB, TB}
+ public enum Units { B, KB, MB, GB, TB }
// Quota to decide how many buckets can be created.
private long quotaInNamespace;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/QuotaList.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/QuotaList.java
index 205cca1..5403469 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/QuotaList.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/QuotaList.java
@@ -28,13 +28,14 @@ public class QuotaList {
private ArrayList<OzoneQuota.Units> unitQuota;
private ArrayList<Long> sizeQuota;
- public QuotaList(){
+ public QuotaList() {
ozoneQuota = new ArrayList<String>();
unitQuota = new ArrayList<OzoneQuota.Units>();
sizeQuota = new ArrayList<Long>();
}
- public void addQuotaList(String oQuota, OzoneQuota.Units uQuota, Long sQuota){
+ public void addQuotaList(
+ String oQuota, OzoneQuota.Units uQuota, Long sQuota) {
ozoneQuota.add(oQuota);
unitQuota.add(uQuota);
sizeQuota.add(sQuota);
@@ -52,15 +53,15 @@ public class QuotaList {
return this.unitQuota;
}
- public OzoneQuota.Units getUnits(String oQuota){
+ public OzoneQuota.Units getUnits(String oQuota) {
return unitQuota.get(ozoneQuota.indexOf(oQuota));
}
- public Long getQuotaSize(OzoneQuota.Units uQuota){
+ public Long getQuotaSize(OzoneQuota.Units uQuota) {
return sizeQuota.get(unitQuota.indexOf(uQuota));
}
- public OzoneQuota.Units getQuotaUnit(Long sQuota){
+ public OzoneQuota.Units getQuotaUnit(Long sQuota) {
return unitQuota.get(sizeQuota.indexOf(sQuota));
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ReplicationFactor.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ReplicationFactor.java
index 044bd6f..8623a0e 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ReplicationFactor.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ReplicationFactor.java
@@ -46,7 +46,7 @@ public enum ReplicationFactor {
* @return ReplicationFactor
*/
public static ReplicationFactor valueOf(int value) {
- if(value == 1) {
+ if (value == 1) {
return ONE;
}
if (value == 3) {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
index c259464..6b7e7c6 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
@@ -296,7 +296,7 @@ public class OzoneConfiguration extends Configuration
return configMap;
}
- private static void addDeprecatedKeys(){
+ private static void addDeprecatedKeys() {
Configuration.addDeprecations(new DeprecationDelta[]{
new DeprecationDelta("ozone.datanode.pipeline.limit",
ScmConfigKeys.OZONE_DATANODE_PIPELINE_LIMIT),
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
index 782a3e1..319fefd 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/fs/CachingSpaceUsageSource.java
@@ -127,7 +127,7 @@ public class CachingSpaceUsageSource implements SpaceUsageSource {
private void refresh() {
//only one `refresh` can be running at a certain moment
- if(isRefreshRunning.compareAndSet(false, true)) {
+ if (isRefreshRunning.compareAndSet(false, true)) {
try {
cachedValue.set(source.getUsedSpace());
} catch (RuntimeException e) {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
index aef3c29..01bd0f4 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
@@ -713,7 +713,7 @@ public class DatanodeDetails extends NodeImpl implements
*
* @return DatanodeDetails.Builder
*/
- public Builder setPersistedOpState(HddsProtos.NodeOperationalState state){
+ public Builder setPersistedOpState(HddsProtos.NodeOperationalState state) {
this.persistedOpState = state;
return this;
}
@@ -726,7 +726,7 @@ public class DatanodeDetails extends NodeImpl implements
*
* @return DatanodeDetails.Builder
*/
- public Builder setPersistedOpStateExpiry(long expiry){
+ public Builder setPersistedOpStateExpiry(long expiry) {
this.persistedOpStateExpiryEpochSec = expiry;
return this;
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java
index 50480c1..c1cd865 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java
@@ -136,7 +136,7 @@ public final class RatisHelper {
}
private static RaftGroup newRaftGroup(Collection<RaftPeer> peers) {
- return peers.isEmpty()? emptyRaftGroup()
+ return peers.isEmpty() ? emptyRaftGroup()
: RaftGroup.valueOf(DUMMY_GROUP_ID, peers);
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfig.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfig.java
index c91a186..d72e27a 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfig.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfig.java
@@ -40,7 +40,7 @@ public class ReconConfig {
type = ConfigType.STRING,
defaultValue = "",
tags = { ConfigTag.SECURITY, ConfigTag.RECON, ConfigTag.OZONE },
- description = "The keytab file used by Recon daemon to login as "+
+ description = "The keytab file used by Recon daemon to login as " +
"its service principal."
)
private String keytab;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ByteStringConversion.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ByteStringConversion.java
index b5f6e48..14a229b 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ByteStringConversion.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ByteStringConversion.java
@@ -32,7 +32,7 @@ import org.apache.ratis.thirdparty.com.google.protobuf.UnsafeByteOperations;
* Ozone configuration.
*/
public final class ByteStringConversion {
- private ByteStringConversion(){} // no instantiation.
+ private ByteStringConversion() { } // no instantiation.
/**
* Creates the conversion function to be used to convert ByteBuffers to
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfig.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfig.java
index baee038..ce79ec2 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfig.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfig.java
@@ -43,7 +43,7 @@ public class ScmConfig {
type = ConfigType.STRING,
defaultValue = "",
tags = { ConfigTag.SECURITY, ConfigTag.OZONE },
- description = "The keytab file used by SCM daemon to login as "+
+ description = "The keytab file used by SCM daemon to login as " +
"its service principal."
)
private String keytab;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
index d4e5634..c1f43c6 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
@@ -525,7 +525,7 @@ public final class ScmConfigKeys {
public static final String OZONE_SCM_HA_RAFT_LOG_PURGE_GAP =
"ozone.scm.ha.ratis.log.purge.gap";
- public static final int OZONE_SCM_HA_RAFT_LOG_PURGE_GAP_DEFAULT =1000000;
+ public static final int OZONE_SCM_HA_RAFT_LOG_PURGE_GAP_DEFAULT = 1000000;
public static final String OZONE_SCM_HA_RATIS_SNAPSHOT_THRESHOLD =
"ozone.scm.ha.ratis.snapshot.threshold";
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java
index 6f6caf3..2f2a7bf 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java
@@ -238,7 +238,7 @@ public class ReplicationManagerReport {
increment(stat);
List<ContainerID> list = containerSample
.computeIfAbsent(stat, k -> new ArrayList<>());
- synchronized(list) {
+ synchronized (list) {
if (list.size() < SAMPLE_LIMIT) {
list.add(container);
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java
index 6446595..b2b566a 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java
@@ -38,7 +38,7 @@ import static org.apache.hadoop.hdds.scm.net.NetConstants.PATH_SEPARATOR;
*/
public class InnerNodeImpl extends NodeImpl implements InnerNode {
protected static class Factory implements InnerNode.Factory<InnerNodeImpl> {
- protected Factory() {}
+ protected Factory() { }
@Override
public InnerNodeImpl newInnerNode(String name, String location,
@@ -93,7 +93,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
} else {
for (Node node: childrenMap.values()) {
if (node instanceof InnerNode) {
- count += ((InnerNode)node).getNumOfNodes(level -1);
+ count += ((InnerNode)node).getNumOfNodes(level - 1);
} else {
throw new RuntimeException("Cannot support Level:" + level +
" on this node " + this.toString());
@@ -119,7 +119,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
} else {
for (Node node: childrenMap.values()) {
if (node instanceof InnerNode) {
- result.addAll(((InnerNode)node).getNodes(level -1));
+ result.addAll(((InnerNode)node).getNodes(level - 1));
} else {
throw new RuntimeException("Cannot support Level:" + level +
" on this node " + this.toString());
@@ -265,7 +265,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
if (child == null) {
return null;
}
- if (path.length == 1){
+ if (path.length == 1) {
return child;
}
if (child instanceof InnerNode) {
@@ -292,7 +292,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
}
return getChildNode(leafIndex);
} else {
- for(Node node : childrenMap.values()) {
+ for (Node node : childrenMap.values()) {
InnerNodeImpl child = (InnerNodeImpl)node;
int leafCount = child.getNumOfLeaves();
if (leafIndex < leafCount) {
@@ -468,7 +468,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
if (leafIndex >= getNumOfChildren()) {
return null;
}
- for(Node node : childrenMap.values()) {
+ for (Node node : childrenMap.values()) {
if (excludedNodes != null && excludedNodes.contains(node)) {
continue;
}
@@ -519,7 +519,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
private Node getChildNode(int index) {
Iterator iterator = childrenMap.values().iterator();
Node node = null;
- while(index >= 0 && iterator.hasNext()) {
+ while (index >= 0 && iterator.hasNext()) {
node = (Node)iterator.next();
index--;
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java
index 43765a6..206a0fd 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java
@@ -45,7 +45,7 @@ import static org.apache.hadoop.hdds.scm.net.NetConstants.ANCESTOR_GENERATION_DE
* (computers) and inner nodes represent datacenter/core-switches/routers that
* manages traffic in/out of data centers or racks.
*/
-public class NetworkTopologyImpl implements NetworkTopology{
+public class NetworkTopologyImpl implements NetworkTopology {
public static final Logger LOG =
LoggerFactory.getLogger(NetworkTopologyImpl.class);
@@ -91,7 +91,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
Preconditions.checkArgument(node != null, "node cannot be null");
if (node instanceof InnerNode) {
throw new IllegalArgumentException(
- "Not allowed to add an inner node: "+ node.getNetworkFullPath());
+ "Not allowed to add an inner node: " + node.getNetworkFullPath());
}
int newDepth = NetUtils.locationToDepth(node.getNetworkLocation()) + 1;
@@ -104,7 +104,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
boolean add;
try {
add = clusterTree.add(node);
- }finally {
+ } finally {
netlock.writeLock().unlock();
}
@@ -126,12 +126,12 @@ public class NetworkTopologyImpl implements NetworkTopology{
Preconditions.checkArgument(node != null, "node cannot be null");
if (node instanceof InnerNode) {
throw new IllegalArgumentException(
- "Not allowed to remove an inner node: "+ node.getNetworkFullPath());
+ "Not allowed to remove an inner node: " + node.getNetworkFullPath());
}
netlock.writeLock().lock();
try {
clusterTree.remove(node);
- }finally {
+ } finally {
netlock.writeLock().unlock();
}
LOG.info("Removed a node: {}", node.getNetworkFullPath());
@@ -534,7 +534,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
" generation " + ancestorGen);
}
// affinity ancestor should has overlap with scope
- if (affinityAncestor.getNetworkFullPath().startsWith(scope)){
+ if (affinityAncestor.getNetworkFullPath().startsWith(scope)) {
finalScope = affinityAncestor.getNetworkFullPath();
} else if (!scope.startsWith(affinityAncestor.getNetworkFullPath())) {
return null;
@@ -655,21 +655,21 @@ public class NetworkTopologyImpl implements NetworkTopology{
if (level1 > maxLevel || level2 > maxLevel) {
return Integer.MAX_VALUE;
}
- while(level1 > level2 && node1 != null) {
+ while (level1 > level2 && node1 != null) {
node1 = node1.getParent();
level1--;
- cost += node1 == null? 0 : node1.getCost();
+ cost += node1 == null ? 0 : node1.getCost();
}
- while(level2 > level1 && node2 != null) {
+ while (level2 > level1 && node2 != null) {
node2 = node2.getParent();
level2--;
- cost += node2 == null? 0 : node2.getCost();
+ cost += node2 == null ? 0 : node2.getCost();
}
- while(node1 != null && node2 != null && node1 != node2) {
+ while (node1 != null && node2 != null && node1 != node2) {
node1 = node1.getParent();
node2 = node2.getParent();
- cost += node1 == null? 0 : node1.getCost();
- cost += node2 == null? 0 : node2.getCost();
+ cost += node1 == null ? 0 : node1.getCost();
+ cost += node2 == null ? 0 : node2.getCost();
}
return cost;
} finally {
@@ -752,7 +752,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
List<Node> excludedAncestorList =
NetUtils.getAncestorList(this, mutableExcludedNodes, ancestorGen);
for (Node ancestor : excludedAncestorList) {
- if (scope.startsWith(ancestor.getNetworkFullPath())){
+ if (scope.startsWith(ancestor.getNetworkFullPath())) {
return 0;
}
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchema.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchema.java
index 47e5de8..fc8e23b 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchema.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchema.java
@@ -28,7 +28,7 @@ public final class NodeSchema {
/**
* Network topology layer type enum definition.
*/
- public enum LayerType{
+ public enum LayerType {
ROOT("Root", NetConstants.INNER_NODE_COST_DEFAULT),
INNER_NODE("InnerNode", NetConstants.INNER_NODE_COST_DEFAULT),
LEAF_NODE("Leaf", NetConstants.NODE_COST_DEFAULT);
@@ -47,7 +47,7 @@ public final class NodeSchema {
return description;
}
- public int getCost(){
+ public int getCost() {
return cost;
}
public static LayerType getType(String typeStr) {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaLoader.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaLoader.java
index cb9690f..289f7e6 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaLoader.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaLoader.java
@@ -68,7 +68,7 @@ public final class NodeSchemaLoader {
private static final int LAYOUT_VERSION = 1;
private static volatile NodeSchemaLoader instance = null;
- private NodeSchemaLoader() {}
+ private NodeSchemaLoader() { }
public static NodeSchemaLoader getInstance() {
if (instance == null) {
@@ -324,7 +324,7 @@ public final class NodeSchemaLoader {
// Integrity check, only one ROOT and one LEAF is allowed
boolean foundRoot = false;
boolean foundLeaf = false;
- for(NodeSchema schema: schemas.values()) {
+ for (NodeSchema schema: schemas.values()) {
if (schema.getType() == LayerType.ROOT) {
if (foundRoot) {
throw new IllegalArgumentException("Multiple ROOT layers are found" +
@@ -385,7 +385,7 @@ public final class NodeSchemaLoader {
+ "> is null");
}
if (TOPOLOGY_PATH.equals(tagName)) {
- if(value.startsWith(NetConstants.PATH_SEPARATOR_STR)) {
+ if (value.startsWith(NetConstants.PATH_SEPARATOR_STR)) {
value = value.substring(1);
}
String[] layerIDs = value.split(NetConstants.PATH_SEPARATOR_STR);
@@ -403,7 +403,7 @@ public final class NodeSchemaLoader {
throw new IllegalArgumentException("Topology path doesn't start "
+ "with ROOT layer");
}
- if (schemas.get(layerIDs[layerIDs.length -1]).getType() !=
+ if (schemas.get(layerIDs[layerIDs.length - 1]).getType() !=
LayerType.LEAF_NODE) {
throw new IllegalArgumentException("Topology path doesn't end "
+ "with LEAF layer");
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
index 044f151..f5c0b62 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
@@ -415,7 +415,7 @@ public final class Pipeline {
private Instant creationTimestamp = null;
private UUID suggestedLeaderId = null;
- public Builder() {}
+ public Builder() { }
public Builder(Pipeline pipeline) {
this.id = pipeline.id;
@@ -486,10 +486,10 @@ public final class Pipeline {
if (nodeOrder != null && !nodeOrder.isEmpty()) {
// This branch is for build from ProtoBuf
List<DatanodeDetails> nodesWithOrder = new ArrayList<>();
- for(int i = 0; i < nodeOrder.size(); i++) {
+ for (int i = 0; i < nodeOrder.size(); i++) {
int nodeIndex = nodeOrder.get(i);
Iterator<DatanodeDetails> it = nodeStatus.keySet().iterator();
- while(it.hasNext() && nodeIndex >= 0) {
+ while (it.hasNext() && nodeIndex >= 0) {
DatanodeDetails node = it.next();
if (nodeIndex == 0) {
nodesWithOrder.add(node);
@@ -503,7 +503,7 @@ public final class Pipeline {
nodesWithOrder, id);
}
pipeline.setNodesInOrder(nodesWithOrder);
- } else if (nodesInOrder != null){
+ } else if (nodesInOrder != null) {
// This branch is for pipeline clone
pipeline.setNodesInOrder(nodesInOrder);
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java
index fcf3f13..7f2d2a8 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java
@@ -434,7 +434,7 @@ public final class ContainerProtocolCalls {
request.setContainerID(containerID);
request.setCloseContainer(CloseContainerRequestProto.getDefaultInstance());
request.setDatanodeUuid(id);
- if(encodedToken != null) {
+ if (encodedToken != null) {
request.setEncodedToken(encodedToken);
}
client.sendCommand(request.build(), getValidatorList());
@@ -458,7 +458,7 @@ public final class ContainerProtocolCalls {
request.setContainerID(containerID);
request.setReadContainer(ReadContainerRequestProto.getDefaultInstance());
request.setDatanodeUuid(id);
- if(encodedToken != null) {
+ if (encodedToken != null) {
request.setEncodedToken(encodedToken);
}
ContainerCommandResponseProto response =
@@ -560,8 +560,8 @@ public final class ContainerProtocolCalls {
ContainerCommandRequestProto request = builder.build();
Map<DatanodeDetails, ContainerCommandResponseProto> responses =
xceiverClient.sendCommandOnAllNodes(request);
- for(Map.Entry<DatanodeDetails, ContainerCommandResponseProto> entry:
- responses.entrySet()){
+ for (Map.Entry<DatanodeDetails, ContainerCommandResponseProto> entry:
+ responses.entrySet()) {
datanodeToResponseMap.put(entry.getKey(), entry.getValue().getGetBlock());
}
return datanodeToResponseMap;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java
index 3195e00..8cd68a0 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java
@@ -37,7 +37,7 @@ public final class HddsVersionInfo {
public static final VersionInfo HDDS_VERSION_INFO =
new VersionInfo("hdds");
- private HddsVersionInfo() {}
+ private HddsVersionInfo() { }
public static void main(String[] args) {
System.out.println("Using HDDS " + HDDS_VERSION_INFO.getVersion());
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/ResourceSemaphore.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/ResourceSemaphore.java
index 96d5996..e1e9598 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/ResourceSemaphore.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/ResourceSemaphore.java
@@ -90,7 +90,7 @@ public class ResourceSemaphore extends Semaphore {
@Override
public String toString() {
- return (isClosed()? "closed/": availablePermits() + "/") + limit;
+ return (isClosed() ? "closed/" : availablePermits() + "/") + limit;
}
/**
@@ -101,7 +101,7 @@ public class ResourceSemaphore extends Semaphore {
public Group(int... limits) {
final List<ResourceSemaphore> list = new ArrayList<>(limits.length);
- for(int limit : limits) {
+ for (int limit : limits) {
list.add(new ResourceSemaphore(limit));
}
this.resources = Collections.unmodifiableList(list);
@@ -131,7 +131,7 @@ public class ResourceSemaphore extends Semaphore {
}
// failed at i, releasing all previous resources
- for(i--; i >= 0; i--) {
+ for (i--; i >= 0; i--) {
resources.get(i).release(permits[i]);
}
return false;
@@ -147,13 +147,13 @@ public class ResourceSemaphore extends Semaphore {
}
protected void release(int... permits) {
- for(int i = resources.size() - 1; i >= 0; i--) {
+ for (int i = resources.size() - 1; i >= 0; i--) {
resources.get(i).release(permits[i]);
}
}
public void close() {
- for(int i = resources.size() - 1; i >= 0; i--) {
+ for (int i = resources.size() - 1; i >= 0; i--) {
resources.get(i).close();
}
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/UniqueId.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/UniqueId.java
index ba062bc..6fff80f6 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/UniqueId.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/UniqueId.java
@@ -51,7 +51,7 @@ public final class UniqueId {
/**
* Private constructor so that no one can instantiate this class.
*/
- private UniqueId() {}
+ private UniqueId() { }
/**
* Calculate and returns next unique id based on System#currentTimeMillis.
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
index cb03623..bdc8789 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
@@ -128,8 +128,8 @@ public final class OzoneConsts {
public static final String CONTAINER_DB_SUFFIX = "container.db";
public static final String PIPELINE_DB_SUFFIX = "pipeline.db";
public static final String CRL_DB_SUFFIX = "crl.db";
- public static final String DN_CONTAINER_DB = "-dn-"+ CONTAINER_DB_SUFFIX;
- public static final String DN_CRL_DB = "dn-"+ CRL_DB_SUFFIX;
+ public static final String DN_CONTAINER_DB = "-dn-" + CONTAINER_DB_SUFFIX;
+ public static final String DN_CRL_DB = "dn-" + CRL_DB_SUFFIX;
public static final String CRL_DB_DIRECTORY_NAME = "crl";
public static final String OM_DB_NAME = "om.db";
public static final String SCM_DB_NAME = "scm.db";
@@ -187,7 +187,7 @@ public final class OzoneConsts {
public static final String OM_KEY_PREFIX = "/";
public static final String OM_USER_PREFIX = "$";
- public static final String OM_S3_PREFIX ="S3:";
+ public static final String OM_S3_PREFIX = "S3:";
public static final String OM_S3_VOLUME_PREFIX = "s3";
public static final String OM_S3_SECRET = "S3Secret:";
public static final String OM_PREFIX = "Prefix:";
@@ -212,7 +212,7 @@ public final class OzoneConsts {
/**
* Quota Units.
*/
- public enum Units {TB, GB, MB, KB, B}
+ public enum Units { TB, GB, MB, KB, B }
/**
* Max number of keys returned per list buckets operation.
@@ -390,7 +390,7 @@ public final class OzoneConsts {
public static final Pattern KEYNAME_ILLEGAL_CHARACTER_CHECK_REGEX =
Pattern.compile("^[^^{}<>^?%~#`\\[\\]\\|\\\\(\\x80-\\xff)]+$");
- public static final String FS_FILE_COPYING_TEMP_SUFFIX= "._COPYING_";
+ public static final String FS_FILE_COPYING_TEMP_SUFFIX = "._COPYING_";
// Transaction Info
public static final String TRANSACTION_INFO_KEY = "#TRANSACTIONINFO";
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditEventStatus.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditEventStatus.java
index 098ab6b..6c20968 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditEventStatus.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditEventStatus.java
@@ -26,7 +26,7 @@ public enum AuditEventStatus {
private String status;
- AuditEventStatus(String status){
+ AuditEventStatus(String status) {
this.status = status;
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditLogger.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditLogger.java
index ee6f45d..9f1f5f0 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditLogger.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditLogger.java
@@ -38,7 +38,7 @@ public class AuditLogger {
* Parametrized Constructor to initialize logger.
* @param type Audit Logger Type
*/
- public AuditLogger(AuditLoggerType type){
+ public AuditLogger(AuditLoggerType type) {
initializeLogger(type);
}
@@ -46,7 +46,7 @@ public class AuditLogger {
* Initializes the logger with specific type.
* @param loggerType specified one of the values from enum AuditLoggerType.
*/
- private void initializeLogger(AuditLoggerType loggerType){
+ private void initializeLogger(AuditLoggerType loggerType) {
this.logger = LogManager.getContext(false).getLogger(loggerType.getType());
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditLoggerType.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditLoggerType.java
index 18241c7..dbfde9f 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditLoggerType.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditLoggerType.java
@@ -31,7 +31,7 @@ public enum AuditLoggerType {
return type;
}
- AuditLoggerType(String type){
+ AuditLoggerType(String type) {
this.type = type;
}
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditMarker.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditMarker.java
index 505b958..3414aa4 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditMarker.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditMarker.java
@@ -28,11 +28,11 @@ public enum AuditMarker {
private Marker marker;
- AuditMarker(Marker marker){
+ AuditMarker(Marker marker) {
this.marker = marker;
}
- public Marker getMarker(){
+ public Marker getMarker() {
return marker;
}
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditMessage.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditMessage.java
index 6f3bbad..9d28c9f 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditMessage.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/AuditMessage.java
@@ -64,12 +64,12 @@ public final class AuditMessage implements Message {
private Map<String, String> params;
private String ret;
- public Builder setUser(String usr){
+ public Builder setUser(String usr) {
this.user = usr;
return this;
}
- public Builder atIp(String ipAddr){
+ public Builder atIp(String ipAddr) {
this.ip = ipAddr;
return this;
}
@@ -79,7 +79,7 @@ public final class AuditMessage implements Message {
return this;
}
- public Builder withParams(Map<String, String> args){
+ public Builder withParams(Map<String, String> args) {
this.params = args;
return this;
}
@@ -89,12 +89,12 @@ public final class AuditMessage implements Message {
return this;
}
- public Builder withException(Throwable ex){
+ public Builder withException(Throwable ex) {
this.throwable = ex;
return this;
}
- public AuditMessage build(){
+ public AuditMessage build() {
String message = "user=" + this.user + " | ip=" + this.ip + " | " +
"op=" + this.op + " " + this.params + " | " + "ret=" + this.ret;
return new AuditMessage(message, throwable);
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumByteBuffer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumByteBuffer.java
index 7ce643d..6187d6b 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumByteBuffer.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumByteBuffer.java
@@ -80,7 +80,7 @@ public interface ChecksumByteBuffer extends Checksum {
}
private static int update(int crc, ByteBuffer b, int[] table) {
- for(; b.remaining() > 7;) {
+ for (; b.remaining() > 7;) {
final int c0 = (b.get() ^ crc) & 0xff;
final int c1 = (b.get() ^ (crc >>>= 8)) & 0xff;
final int c2 = (b.get() ^ (crc >>>= 8)) & 0xff;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/IncrementalChunkBuffer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/IncrementalChunkBuffer.java
index 7622ffc..5a63c09 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/IncrementalChunkBuffer.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/IncrementalChunkBuffer.java
@@ -57,8 +57,9 @@ final class IncrementalChunkBuffer implements ChunkBuffer {
Preconditions.checkArgument(increment > 0);
this.limit = limit;
this.increment = increment;
- this.limitIndex = limit/increment;
- this.buffers = new ArrayList<>(limitIndex + (limit%increment == 0? 0: 1));
+ this.limitIndex = limit / increment;
+ this.buffers = new ArrayList<>(
+ limitIndex + (limit % increment == 0 ? 0 : 1));
this.isDuplicated = isDuplicated;
}
@@ -66,7 +67,7 @@ final class IncrementalChunkBuffer implements ChunkBuffer {
private int getBufferCapacityAtIndex(int i) {
Preconditions.checkArgument(i >= 0);
Preconditions.checkArgument(i <= limitIndex);
- return i < limitIndex? increment: limit%increment;
+ return i < limitIndex ? increment : limit % increment;
}
private void assertInt(int expected, int computed, String name, int i) {
@@ -126,7 +127,7 @@ final class IncrementalChunkBuffer implements ChunkBuffer {
Preconditions.checkArgument(position < limit);
final int i = position / increment;
final ByteBuffer ith = getAndAllocateAtIndex(i);
- assertInt(position%increment, ith.position(), "position", i);
+ assertInt(position % increment, ith.position(), "position", i);
return ith;
}
@@ -207,7 +208,7 @@ final class IncrementalChunkBuffer implements ChunkBuffer {
}
final int thatLimit = that.limit();
- for(int p = position(); that.position() < thatLimit;) {
+ for (int p = position(); that.position() < thatLimit;) {
final ByteBuffer b = getAndAllocateAtPosition(p);
final int min = Math.min(b.remaining(), thatLimit - that.position());
that.limit(that.position() + min);
@@ -229,7 +230,7 @@ final class IncrementalChunkBuffer implements ChunkBuffer {
final int pr = newPosition % increment;
final int li = newLimit / increment;
final int lr = newLimit % increment;
- final int newSize = lr == 0? li: li + 1;
+ final int newSize = lr == 0 ? li : li + 1;
for (int i = 0; i < newSize; i++) {
final int pos = i < pi ? increment : i == pi ? pr : 0;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java
index e6e1df5..6ba4384 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java
@@ -109,7 +109,7 @@ public class StorageInfo {
public Long getCreationTime() {
String creationTime = properties.getProperty(CREATION_TIME);
- if(creationTime != null) {
+ if (creationTime != null) {
return Long.parseLong(creationTime);
}
return null;
@@ -117,7 +117,7 @@ public class StorageInfo {
public int getLayoutVersion() {
String layout = properties.getProperty(LAYOUT_VERSION);
- if(layout != null) {
+ if (layout != null) {
return Integer.parseInt(layout);
}
return 0;
@@ -166,7 +166,7 @@ public class StorageInfo {
throws InconsistentStorageStateException {
NodeType nodeType = getNodeType();
Preconditions.checkNotNull(nodeType);
- if(type != nodeType) {
+ if (type != nodeType) {
throw new InconsistentStorageStateException("Expected NodeType: " + type +
", but found: " + nodeType);
}
@@ -176,7 +176,7 @@ public class StorageInfo {
throws InconsistentStorageStateException {
String clusterId = getClusterID();
Preconditions.checkNotNull(clusterId);
- if(clusterId.isEmpty()) {
+ if (clusterId.isEmpty()) {
throw new InconsistentStorageStateException("Cluster ID not found");
}
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ha/ratis/RatisSnapshotInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ha/ratis/RatisSnapshotInfo.java
index a9de892..ebc4bba 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ha/ratis/RatisSnapshotInfo.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ha/ratis/RatisSnapshotInfo.java
@@ -50,7 +50,7 @@ public class RatisSnapshotInfo implements SnapshotInfo {
this.snapshotIndex = newIndex;
}
- public RatisSnapshotInfo() {}
+ public RatisSnapshotInfo() { }
public RatisSnapshotInfo(long term, long index) {
this.term = term;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/BlockData.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/BlockData.java
index 8ea1689..434e497 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/BlockData.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/BlockData.java
@@ -161,8 +161,8 @@ public class BlockData {
* @return list of chunkinfo.
*/
public List<ContainerProtos.ChunkInfo> getChunks() {
- return chunkList == null? Collections.emptyList()
- : chunkList instanceof ContainerProtos.ChunkInfo?
+ return chunkList == null ? Collections.emptyList()
+ : chunkList instanceof ContainerProtos.ChunkInfo ?
Collections.singletonList((ContainerProtos.ChunkInfo)chunkList)
: Collections.unmodifiableList(castChunkList());
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerCommandRequestPBHelper.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerCommandRequestPBHelper.java
index 7773828..a13f164 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerCommandRequestPBHelper.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerCommandRequestPBHelper.java
@@ -45,7 +45,7 @@ public final class ContainerCommandRequestPBHelper {
Map<String, String> auditParams = new TreeMap<>();
Type cmdType = msg.getCmdType();
String containerID = String.valueOf(msg.getContainerID());
- switch(cmdType) {
+ switch (cmdType) {
case CreateContainer:
auditParams.put("containerID", containerID);
auditParams.put("containerType",
@@ -75,11 +75,11 @@ public final class ContainerCommandRequestPBHelper {
return auditParams;
case PutBlock:
- try{
+ try {
auditParams.put("blockData",
BlockData.getFromProtoBuf(msg.getPutBlock().getBlockData())
.toString());
- } catch (IOException ex){
+ } catch (IOException ex) {
if (LOG.isTraceEnabled()) {
LOG.trace("Encountered error parsing BlockData from protobuf: "
+ ex.getMessage());
@@ -132,11 +132,11 @@ public final class ContainerCommandRequestPBHelper {
case CompactChunk: return null; //CompactChunk operation
case PutSmallFile:
- try{
+ try {
auditParams.put("blockData",
BlockData.getFromProtoBuf(msg.getPutSmallFile()
.getBlock().getBlockData()).toString());
- } catch (IOException ex){
+ } catch (IOException ex) {
if (LOG.isTraceEnabled()) {
LOG.trace("Encountered error parsing BlockData from protobuf: "
+ ex.getMessage());
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/Lease.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/Lease.java
index e95105b..2fd7a9d 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/Lease.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/Lease.java
@@ -90,7 +90,7 @@ public class Lease<T> {
*/
public void registerCallBack(Callable<Void> callback)
throws LeaseExpiredException {
- if(hasExpired()) {
+ if (hasExpired()) {
throw new LeaseExpiredException(messageForResource(resource));
}
callbacks.add(callback);
@@ -104,7 +104,7 @@ public class Lease<T> {
* If the lease has already timed out
*/
public long getElapsedTime() throws LeaseExpiredException {
- if(hasExpired()) {
+ if (hasExpired()) {
throw new LeaseExpiredException(messageForResource(resource));
}
return Time.monotonicNow() - creationTime;
@@ -129,7 +129,7 @@ public class Lease<T> {
* If the lease has already timed out
*/
public long getLeaseLifeTime() throws LeaseExpiredException {
- if(hasExpired()) {
+ if (hasExpired()) {
throw new LeaseExpiredException(messageForResource(resource));
}
return leaseTimeout.get();
@@ -144,7 +144,7 @@ public class Lease<T> {
* If the lease has already timed out
*/
public void renew(long timeout) throws LeaseExpiredException {
- if(hasExpired()) {
+ if (hasExpired()) {
throw new LeaseExpiredException(messageForResource(resource));
}
leaseTimeout.addAndGet(timeout);
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/LeaseCallbackExecutor.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/LeaseCallbackExecutor.java
index a79d517..3f2d5fb 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/LeaseCallbackExecutor.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/LeaseCallbackExecutor.java
@@ -53,7 +53,7 @@ public class LeaseCallbackExecutor<T> implements Runnable {
if (LOG.isDebugEnabled()) {
LOG.debug("Executing callbacks for lease on {}", resource);
}
- for(Callable<Void> callback : callbacks) {
+ for (Callable<Void> callback : callbacks) {
try {
callback.call();
} catch (Exception e) {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/util/ShutdownHookManager.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/util/ShutdownHookManager.java
index 45f0638..b3ffe59 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/util/ShutdownHookManager.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/util/ShutdownHookManager.java
@@ -104,7 +104,7 @@ public final class ShutdownHookManager {
long ended = System.currentTimeMillis();
LOG.debug(String.format(
"Completed shutdown in %.3f seconds; Timeouts: %d",
- (ended-started)/1000.0, timeoutCount));
+ (ended - started) / 1000.0, timeoutCount));
// each of the hooks have executed; now shut down the
// executor itself.
shutdownExecutor(new OzoneConfiguration());
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHddsUtils.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHddsUtils.java
index ef93927..fd8aa28 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHddsUtils.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/TestHddsUtils.java
@@ -122,7 +122,7 @@ public class TestHddsUtils {
assertThat(addresses.size(), is(3));
it = addresses.iterator();
HashMap<String, Integer> expected1 = new HashMap<>(hostsAndPorts);
- while(it.hasNext()) {
+ while (it.hasNext()) {
InetSocketAddress current = it.next();
assertTrue(expected1.remove(current.getHostName(),
current.getPort()));
@@ -136,7 +136,7 @@ public class TestHddsUtils {
assertThat(addresses.size(), is(3));
it = addresses.iterator();
HashMap<String, Integer> expected2 = new HashMap<>(hostsAndPorts);
- while(it.hasNext()) {
+ while (it.hasNext()) {
InetSocketAddress current = it.next();
assertTrue(expected2.remove(current.getHostName(),
current.getPort()));
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/client/TestReplicationConfig.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/client/TestReplicationConfig.java
index 9adf8f7..1315ad5 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/client/TestReplicationConfig.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/client/TestReplicationConfig.java
@@ -167,7 +167,7 @@ public class TestReplicationConfig {
@Test
public void testValidationBasedOnConfig() {
OzoneConfiguration conf = new OzoneConfiguration();
- conf.set(OZONE_REPLICATION+".allowed-configs",
+ conf.set(OZONE_REPLICATION + ".allowed-configs",
"^STANDALONE/ONE|RATIS/THREE$");
conf.set(OZONE_REPLICATION, factor);
conf.set(OZONE_REPLICATION_TYPE, type);
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDU.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDU.java
index b057349..c9ed258 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDU.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/fs/TestDU.java
@@ -96,7 +96,7 @@ public class TestDU {
long usedSpace = du.getUsedSpace();
- assertFileSize(4*KB, usedSpace);
+ assertFileSize(4 * KB, usedSpace);
}
private static void assertFileSize(long expected, long actual) {
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/ratis/TestContainerCommandRequestMessage.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/ratis/TestContainerCommandRequestMessage.java
index 469faac..d3ddbe0 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/ratis/TestContainerCommandRequestMessage.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/ratis/TestContainerCommandRequestMessage.java
@@ -45,7 +45,7 @@ public class TestContainerCommandRequestMessage {
static ByteString newData(int length) {
final ByteString.Output out = ByteString.newOutput();
- for(int i = 0; i < length; i++) {
+ for (int i = 0; i < length; i++) {
out.write(RANDOM.nextInt());
}
return out.toByteString();
@@ -128,10 +128,10 @@ public class TestContainerCommandRequestMessage {
static void runTest(
BiFunction<BlockID, ByteString, ContainerCommandRequestProto> method)
throws Exception {
- for(int i = 0; i < 2; i++) {
+ for (int i = 0; i < 2; i++) {
runTest(i, method);
}
- for(int i = 2; i < 1 << 10;) {
+ for (int i = 2; i < 1 << 10;) {
runTest(i + 1 + RANDOM.nextInt(i - 1), method);
i <<= 1;
runTest(i, method);
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMNodeInfo.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMNodeInfo.java
index 12a0240..e561bb7 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMNodeInfo.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMNodeInfo.java
@@ -93,7 +93,7 @@ public class TestSCMNodeInfo {
int count = 1;
for (SCMNodeInfo scmNodeInfo : scmNodeInfos) {
Assert.assertEquals(scmServiceId, scmNodeInfo.getServiceId());
- Assert.assertEquals("scm"+count++, scmNodeInfo.getNodeId());
+ Assert.assertEquals("scm" + count++, scmNodeInfo.getNodeId());
Assert.assertEquals("localhost:" + ++port,
scmNodeInfo.getBlockClientAddress());
Assert.assertEquals("localhost:" + ++port,
@@ -117,7 +117,7 @@ public class TestSCMNodeInfo {
int count = 1;
for (SCMNodeInfo scmNodeInfo : scmNodeInfos) {
Assert.assertEquals(scmServiceId, scmNodeInfo.getServiceId());
- Assert.assertEquals("scm"+count++, scmNodeInfo.getNodeId());
+ Assert.assertEquals("scm" + count++, scmNodeInfo.getNodeId());
Assert.assertEquals("localhost:" + OZONE_SCM_BLOCK_CLIENT_PORT_DEFAULT,
scmNodeInfo.getBlockClientAddress());
Assert.assertEquals("localhost:" +
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java
index 0008e66..e50eca2 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java
@@ -171,7 +171,7 @@ public class TestNetworkTopologyImpl {
@Test
public void testContains() {
Node nodeNotInMap = createDatanode("8.8.8.8", "/d2/r4");
- for (int i=0; i < dataNodes.length; i++) {
+ for (int i = 0; i < dataNodes.length; i++) {
assertTrue(cluster.contains(dataNodes[i]));
}
assertFalse(cluster.contains(nodeNotInMap));
@@ -238,7 +238,7 @@ public class TestNetworkTopologyImpl {
assumeTrue(cluster.getMaxLevel() > 2);
int maxLevel = cluster.getMaxLevel();
assertTrue(cluster.isSameParent(dataNodes[0], dataNodes[1]));
- while(maxLevel > 1) {
+ while (maxLevel > 1) {
assertTrue(cluster.isSameAncestor(dataNodes[0], dataNodes[1],
maxLevel - 1));
maxLevel--;
@@ -262,17 +262,17 @@ public class TestNetworkTopologyImpl {
@Test
public void testAddRemove() {
- for(int i = 0; i < dataNodes.length; i++) {
+ for (int i = 0; i < dataNodes.length; i++) {
cluster.remove(dataNodes[i]);
}
- for(int i = 0; i < dataNodes.length; i++) {
+ for (int i = 0; i < dataNodes.length; i++) {
assertFalse(cluster.contains(dataNodes[i]));
}
// no leaf nodes
assertEquals(0, cluster.getNumOfLeafNode(null));
// no inner nodes
assertEquals(0, cluster.getNumOfNodes(2));
- for(int i = 0; i < dataNodes.length; i++) {
+ for (int i = 0; i < dataNodes.length; i++) {
cluster.add(dataNodes[i]);
}
// Inner nodes are created automatically
@@ -467,10 +467,10 @@ public class TestNetworkTopologyImpl {
}};
int leafNum = cluster.getNumOfLeafNode(null);
Map<Node, Integer> frequency;
- for(Node[] list : excludedNodeLists) {
+ for (Node[] list : excludedNodeLists) {
List<Node> excludedList = Arrays.asList(list);
int ancestorGen = 0;
- while(ancestorGen < cluster.getMaxLevel()) {
+ while (ancestorGen < cluster.getMaxLevel()) {
frequency = pickNodesAtRandom(leafNum, null, excludedList, ancestorGen);
List<Node> ancestorList = NetUtils.getAncestorList(cluster,
excludedList, ancestorGen);
@@ -490,7 +490,7 @@ public class TestNetworkTopologyImpl {
// all nodes excluded, no node will be picked
List<Node> excludedList = Arrays.asList(dataNodes);
int ancestorGen = 0;
- while(ancestorGen < cluster.getMaxLevel()) {
+ while (ancestorGen < cluster.getMaxLevel()) {
frequency = pickNodesAtRandom(leafNum, null, excludedList, ancestorGen);
for (Node key : dataNodes) {
assertTrue(frequency.get(key) == 0);
@@ -500,7 +500,7 @@ public class TestNetworkTopologyImpl {
// out scope excluded nodes, each node will be picked
excludedList = Arrays.asList(createDatanode("1.1.1.1.", "/city1/rack1"));
ancestorGen = 0;
- while(ancestorGen < cluster.getMaxLevel()) {
+ while (ancestorGen < cluster.getMaxLevel()) {
frequency = pickNodes(leafNum, null, excludedList, null, ancestorGen);
for (Node key : dataNodes) {
assertTrue(frequency.get(key) != 0);
@@ -536,7 +536,7 @@ public class TestNetworkTopologyImpl {
while (!path.equals(ROOT)) {
scope = "~" + path;
int ancestorGen = 0;
- while(ancestorGen < cluster.getMaxLevel()) {
+ while (ancestorGen < cluster.getMaxLevel()) {
for (Node[] list : excludedNodeLists) {
List<Node> excludedList = Arrays.asList(list);
frequency =
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockPipeline.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockPipeline.java
index b7b3dc6..00124d9 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockPipeline.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockPipeline.java
@@ -51,7 +51,7 @@ public final class MockPipeline {
public static Pipeline createPipeline(int numNodes) throws IOException {
Preconditions.checkArgument(numNodes >= 1);
final List<DatanodeDetails> ids = new ArrayList<>(numNodes);
- for(int i = 0; i < numNodes; i++) {
+ for (int i = 0; i < numNodes; i++) {
ids.add(MockDatanodeDetails.randomLocalDatanodeDetails());
}
return createPipeline(ids);
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/MockGatheringChannel.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/MockGatheringChannel.java
index fe4ccc0..ce6f58d 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/MockGatheringChannel.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/MockGatheringChannel.java
@@ -43,7 +43,7 @@ public class MockGatheringChannel implements GatheringByteChannel {
throws IOException {
checkElementIndex(offset, srcs.length, "offset");
- checkElementIndex(offset+length-1, srcs.length, "offset+length");
+ checkElementIndex(offset + length - 1, srcs.length, "offset+length");
long bytes = 0;
for (ByteBuffer b : srcs) {
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/TestResourceSemaphore.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/TestResourceSemaphore.java
index cbdd558..f9c194d 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/TestResourceSemaphore.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/utils/TestResourceSemaphore.java
@@ -52,18 +52,18 @@ public class TestResourceSemaphore {
try {
g.release(1, 0);
Assert.fail("Should have failed.");
- } catch (IllegalStateException e){
+ } catch (IllegalStateException e) {
}
try {
g.release(0, 1);
Assert.fail("Should have failed.");
- } catch (IllegalStateException e){
+ } catch (IllegalStateException e) {
}
}
static void assertUsed(ResourceSemaphore.Group g, int... expected) {
Assert.assertEquals(expected.length, g.resourceSize());
- for(int i = 0; i < expected.length; i++) {
+ for (int i = 0; i < expected.length; i++) {
Assert.assertEquals(expected[i], g.get(i).used());
}
}
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/DummyEntity.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/DummyEntity.java
index 0c2d98f..9555225 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/DummyEntity.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/DummyEntity.java
@@ -27,7 +27,7 @@ public class DummyEntity implements Auditable {
private String key1;
private String key2;
- public DummyEntity(){
+ public DummyEntity() {
this.key1 = "value1";
this.key2 = "value2";
}
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java
index 41dc4f5..01fceae 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java
@@ -189,7 +189,7 @@ public class TestOzoneAuditLogger {
lines = FileUtils.readLines(file, (String)null);
try {
Thread.sleep(500 * (i + 1));
- } catch(InterruptedException ie) {
+ } catch (InterruptedException ie) {
Thread.currentThread().interrupt();
break;
}
@@ -212,7 +212,7 @@ public class TestOzoneAuditLogger {
assertEquals(0, lines.size());
}
- private static class TestException extends Exception{
+ private static class TestException extends Exception {
TestException(String message) {
super(message);
}
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChecksum.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChecksum.java
index 2e144e6..a61ff90 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChecksum.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChecksum.java
@@ -73,7 +73,7 @@ public class TestChecksum {
// Change the data and check if new checksum matches the original checksum.
// Modifying one byte of data should be enough for the checksum data to
// mismatch
- data[50] = (byte) (data[50]+1);
+ data[50] = (byte) (data[50] + 1);
ChecksumData newChecksumData = checksum.computeChecksum(data);
Assert.assertNotEquals("Checksums should not match for different data",
originalChecksumData, newChecksumData);
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChunkBuffer.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChunkBuffer.java
index 9b69fad..1e85099 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChunkBuffer.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChunkBuffer.java
@@ -46,7 +46,7 @@ public class TestChunkBuffer {
public void testImplWithByteBuffer() {
runTestImplWithByteBuffer(1);
runTestImplWithByteBuffer(1 << 10);
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
runTestImplWithByteBuffer(nextInt(100) + 1);
}
}
@@ -62,7 +62,7 @@ public class TestChunkBuffer {
runTestIncrementalChunkBuffer(1, 1);
runTestIncrementalChunkBuffer(4, 8);
runTestIncrementalChunkBuffer(16, 1 << 10);
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
final int a = ThreadLocalRandom.current().nextInt(100) + 1;
final int b = ThreadLocalRandom.current().nextInt(100) + 1;
runTestIncrementalChunkBuffer(Math.min(a, b), Math.max(a, b));
@@ -80,7 +80,7 @@ public class TestChunkBuffer {
public void testImplWithList() {
runTestImplWithList(4, 8);
runTestImplWithList(16, 1 << 10);
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
final int a = ThreadLocalRandom.current().nextInt(10) + 1;
final int b = ThreadLocalRandom.current().nextInt(100) + 1;
runTestImplWithList(Math.min(a, b), Math.max(a, b));
@@ -131,7 +131,7 @@ public class TestChunkBuffer {
assertIterate(expected, impl, bpc);
} else if (bpc == 0) {
for (int d = 1; d < 5; d++) {
- final int bytesPerChecksum = n/d;
+ final int bytesPerChecksum = n / d;
if (bytesPerChecksum > 0) {
assertIterate(expected, impl, bytesPerChecksum);
}
@@ -148,7 +148,7 @@ public class TestChunkBuffer {
private static void assertDuplicate(byte[] expected, ChunkBuffer impl) {
final int n = expected.length;
assertToByteString(expected, 0, n, impl);
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
final int offset = nextInt(n);
final int length = nextInt(n - offset + 1);
assertToByteString(expected, offset, length, impl);
@@ -165,14 +165,14 @@ public class TestChunkBuffer {
final int numChecksums = (n + bpc - 1) / bpc;
final Iterator<ByteBuffer> i = duplicated.iterate(bpc).iterator();
int count = 0;
- for(int j = 0; j < numChecksums; j++) {
+ for (int j = 0; j < numChecksums; j++) {
final ByteBuffer b = i.next();
- final int expectedRemaining = j < numChecksums - 1?
- bpc : n - bpc *(numChecksums - 1);
+ final int expectedRemaining = j < numChecksums - 1 ?
+ bpc : n - bpc * (numChecksums - 1);
Assert.assertEquals(expectedRemaining, b.remaining());
- final int offset = j* bpc;
- for(int k = 0; k < expectedRemaining; k++) {
+ final int offset = j * bpc;
+ for (int k = 0; k < expectedRemaining; k++) {
Assert.assertEquals(expected[offset + k], b.get());
count++;
}
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestStateMachine.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestStateMachine.java
index c1470bb..be0575d 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestStateMachine.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestStateMachine.java
@@ -45,12 +45,12 @@ public class TestStateMachine {
/**
* STATES used by the test state machine.
*/
- public enum STATES {INIT, CREATING, OPERATIONAL, CLOSED, CLEANUP, FINAL};
+ public enum STATES { INIT, CREATING, OPERATIONAL, CLOSED, CLEANUP, FINAL };
/**
* EVENTS used by the test state machine.
*/
- public enum EVENTS {ALLOCATE, CREATE, UPDATE, CLOSE, DELETE, TIMEOUT};
+ public enum EVENTS { ALLOCATE, CREATE, UPDATE, CLOSE, DELETE, TIMEOUT };
@Rule
public ExpectedException exception = ExpectedException.none();
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
index 95282d5..c2e4c55 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
@@ -352,7 +352,7 @@ public final class ContainerTestHelper {
LOG.trace("addContainer: {}", containerID);
Builder request = getContainerCommandRequestBuilder(containerID, pipeline);
- if(token != null){
+ if (token != null) {
request.setEncodedToken(token.encodeToUrlString());
}
return request.build();
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/lease/TestLeaseManager.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/lease/TestLeaseManager.java
index a51be5f..c9b9bf1 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/lease/TestLeaseManager.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/lease/TestLeaseManager.java
@@ -51,7 +51,7 @@ public class TestLeaseManager {
@Override
public boolean equals(Object obj) {
- if(obj instanceof DummyResource) {
+ if (obj instanceof DummyResource) {
return name.equals(((DummyResource) obj).name);
}
return false;
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
index 58c6e72..3b9afa9 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
@@ -111,12 +111,12 @@ public class HddsDatanodeService extends GenericCli implements ServicePlugin {
private final Map<String, RatisDropwizardExports> ratisMetricsMap =
new ConcurrentHashMap<>();
private DNMXBeanImpl serviceRuntimeInfo =
- new DNMXBeanImpl(HddsVersionInfo.HDDS_VERSION_INFO) {};
+ new DNMXBeanImpl(HddsVersionInfo.HDDS_VERSION_INFO) { };
private ObjectName dnInfoBeanName;
private DatanodeCRLStore dnCRLStore;
//Constructor for DataNode PluginService
- public HddsDatanodeService(){}
+ public HddsDatanodeService() { }
public HddsDatanodeService(boolean printBanner, String[] args) {
this.printBanner = printBanner;
@@ -376,7 +376,7 @@ public class HddsDatanodeService extends GenericCli implements ServicePlugin {
datanodeDetails.getProtoBufMessage(),
getEncodedString(csr));
// Persist certificates.
- if(response.hasX509CACertificate()) {
+ if (response.hasX509CACertificate()) {
String pemEncodedCert = response.getX509Certificate();
dnCertClient.storeCertificate(pemEncodedCert, true);
dnCertClient.storeCertificate(response.getX509CACertificate(), true,
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java
index 970251c..3d6cb3b 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java
@@ -44,7 +44,7 @@ import org.apache.hadoop.metrics2.lib.MutableRate;
*
*/
@InterfaceAudience.Private
-@Metrics(about="Storage Container DataNode Metrics", context="dfs")
+@Metrics(about = "Storage Container DataNode Metrics", context = "dfs")
public class ContainerMetrics {
public static final String STORAGE_CONTAINER_METRICS =
"StorageContainerMetrics";
@@ -106,7 +106,7 @@ public class ContainerMetrics {
numOpsArray[type.ordinal()].incr();
}
- public long getContainerOpsMetrics(ContainerProtos.Type type){
+ public long getContainerOpsMetrics(ContainerProtos.Type type) {
return numOpsArray[type.ordinal()].value();
}
@@ -122,7 +122,7 @@ public class ContainerMetrics {
opsBytesArray[type.ordinal()].incr(bytes);
}
- public long getContainerBytesMetrics(ContainerProtos.Type type){
+ public long getContainerBytesMetrics(ContainerProtos.Type type) {
return opsBytesArray[type.ordinal()].value();
}
}
\ No newline at end of file
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java
index 032705d..2b63183 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java
@@ -189,7 +189,7 @@ public final class ContainerUtils {
HddsConfigKeys.HDDS_CONTAINER_CHECKSUM_VERIFICATION_ENABLED,
HddsConfigKeys.
HDDS_CONTAINER_CHECKSUM_VERIFICATION_ENABLED_DEFAULT);
- if(enabled) {
+ if (enabled) {
String storedChecksum = containerData.getChecksum();
Yaml yaml = ContainerDataYaml.getYamlForContainerType(
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java
index 5dbba2b..1edd046 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java
@@ -581,16 +581,17 @@ public class HddsDispatcher implements ContainerDispatcher, Auditor {
}
private void audit(AuditAction action, EventType eventType,
- Map<String, String> params, AuditEventStatus result, Throwable exception){
+ Map<String, String> params, AuditEventStatus result,
+ Throwable exception) {
AuditMessage amsg;
switch (result) {
case SUCCESS:
- if(isAllowed(action.getAction())) {
- if(eventType == EventType.READ &&
+ if (isAllowed(action.getAction())) {
+ if (eventType == EventType.READ &&
AUDIT.getLogger().isInfoEnabled(AuditMarker.READ.getMarker())) {
amsg = buildAuditMessageForSuccess(action, params);
AUDIT.logReadSuccess(amsg);
- } else if(eventType == EventType.WRITE &&
+ } else if (eventType == EventType.WRITE &&
AUDIT.getLogger().isInfoEnabled(AuditMarker.WRITE.getMarker())) {
amsg = buildAuditMessageForSuccess(action, params);
AUDIT.logWriteSuccess(amsg);
@@ -599,11 +600,11 @@ public class HddsDispatcher implements ContainerDispatcher, Auditor {
break;
case FAILURE:
- if(eventType == EventType.READ &&
+ if (eventType == EventType.READ &&
AUDIT.getLogger().isErrorEnabled(AuditMarker.READ.getMarker())) {
amsg = buildAuditMessageForFailure(action, params, exception);
AUDIT.logReadFailure(amsg);
- } else if(eventType == EventType.WRITE &&
+ } else if (eventType == EventType.WRITE &&
AUDIT.getLogger().isErrorEnabled(AuditMarker.WRITE.getMarker())) {
amsg = buildAuditMessageForFailure(action, params, exception);
AUDIT.logWriteFailure(amsg);
@@ -656,7 +657,7 @@ public class HddsDispatcher implements ContainerDispatcher, Auditor {
* @return true or false accordingly.
*/
private boolean isAllowed(String action) {
- switch(action) {
+ switch (action) {
case "CLOSE_CONTAINER":
case "CREATE_CONTAINER":
case "LIST_CONTAINER":
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/OpenContainerBlockMap.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/OpenContainerBlockMap.java
index b736eb5..d6ca2d1 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/OpenContainerBlockMap.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/OpenContainerBlockMap.java
@@ -130,7 +130,7 @@ public class OpenContainerBlockMap {
public void removeFromBlockMap(BlockID blockID) {
Preconditions.checkNotNull(blockID);
containers.computeIfPresent(blockID.getContainerID(), (containerId, blocks)
- -> blocks.removeAndGetSize(blockID.getLocalID()) == 0? null: blocks);
+ -> blocks.removeAndGetSize(blockID.getLocalID()) == 0 ? null : blocks);
}
/**
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeConfiguration.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeConfiguration.java
index be83d9b..24df9f5 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeConfiguration.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeConfiguration.java
@@ -121,7 +121,7 @@ public class DatanodeConfiguration {
type = ConfigType.INT,
defaultValue = "1440",
tags = {DATANODE},
- description = "The maximum number of block delete commands queued on "+
+ description = "The maximum number of block delete commands queued on " +
" a datanode"
)
private int blockDeleteQueueLimit = 60 * 24;
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java
index e1fc297..ce79049 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java
@@ -293,7 +293,7 @@ public class DatanodeStateMachine implements Closeable {
now = Time.monotonicNow();
if (now < nextHB.get()) {
- if(!Thread.interrupted()) {
+ if (!Thread.interrupted()) {
try {
Thread.sleep(nextHB.get() - now);
} catch (InterruptedException e) {
@@ -379,7 +379,7 @@ public class DatanodeStateMachine implements Closeable {
connectionManager.close();
}
- if(container != null) {
+ if (container != null) {
container.stop();
}
@@ -637,12 +637,12 @@ public class DatanodeStateMachine implements Closeable {
}
public StatusAndMessages finalizeUpgrade()
- throws IOException{
+ throws IOException {
return upgradeFinalizer.finalize(datanodeDetails.getUuidString(), this);
}
public StatusAndMessages queryUpgradeStatus()
- throws IOException{
+ throws IOException {
return upgradeFinalizer.reportStatus(datanodeDetails.getUuidString(),
true);
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/StateContext.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/StateContext.java
index 9eea758..c75da0a 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/StateContext.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/StateContext.java
@@ -184,7 +184,7 @@ public class StateContext {
/**
* init related ReportType Collections.
*/
- private void initReportTypeCollection(){
+ private void initReportTypeCollection() {
fullReportTypeList.add(CONTAINER_REPORTS_PROTO_NAME);
type2Reports.put(CONTAINER_REPORTS_PROTO_NAME, containerReports);
fullReportTypeList.add(NODE_REPORT_PROTO_NAME);
@@ -221,7 +221,7 @@ public class StateContext {
*/
boolean isExiting(DatanodeStateMachine.DatanodeStates newState) {
boolean isExiting = state != newState && stateExecutionCount.get() > 0;
- if(isExiting) {
+ if (isExiting) {
stateExecutionCount.set(0);
}
return isExiting;
@@ -344,7 +344,7 @@ public class StateContext {
Preconditions.checkState(reportType != null);
}
synchronized (incrementalReportsQueue) {
- if (incrementalReportsQueue.containsKey(endpoint)){
+ if (incrementalReportsQueue.containsKey(endpoint)) {
incrementalReportsQueue.get(endpoint).addAll(0, reportsToPutBack);
}
}
@@ -381,7 +381,7 @@ public class StateContext {
InetSocketAddress endpoint) {
Map<String, AtomicBoolean> mp = fullReportSendIndicator.get(endpoint);
List<GeneratedMessage> nonIncrementalReports = new LinkedList<>();
- if (null != mp){
+ if (null != mp) {
for (Map.Entry<String, AtomicBoolean> kv : mp.entrySet()) {
if (kv.getValue().get()) {
String reportType = kv.getKey();
@@ -817,14 +817,14 @@ public class StateContext {
*/
public boolean updateCommandStatus(Long cmdId,
Consumer<CommandStatus> cmdStatusUpdater) {
- if(cmdStatusMap.containsKey(cmdId)) {
+ if (cmdStatusMap.containsKey(cmdId)) {
cmdStatusUpdater.accept(cmdStatusMap.get(cmdId));
return true;
}
return false;
}
- public void configureHeartbeatFrequency(){
+ public void configureHeartbeatFrequency() {
heartbeatFrequency.set(getScmHeartbeatInterval(conf));
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/CommandDispatcher.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/CommandDispatcher.java
index a5044cb..7908e3d 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/CommandDispatcher.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/CommandDispatcher.java
@@ -68,7 +68,7 @@ public final class CommandDispatcher {
this.connectionManager = connectionManager;
handlerMap = new HashMap<>();
for (CommandHandler h : handlers) {
- if(handlerMap.containsKey(h.getCommandType())){
+ if (handlerMap.containsKey(h.getCommandType())) {
LOG.error("Duplicate handler for the same command. Exiting. Handle " +
"key : {}", h.getCommandType().getDescriptorForType().getName());
throw new IllegalArgumentException("Duplicate handler for the same " +
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java
index 217592d..a766de0 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java
@@ -81,7 +81,7 @@ public class InitDatanodeState implements DatanodeState,
try {
addresses = getSCMAddressForDatanodes(conf);
} catch (IllegalArgumentException e) {
- if(!Strings.isNullOrEmpty(e.getMessage())) {
+ if (!Strings.isNullOrEmpty(e.getMessage())) {
LOG.error("Failed to get SCM addresses: {}", e.getMessage());
}
return DatanodeStateMachine.DatanodeStates.SHUTDOWN;
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/VersionEndpointTask.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/VersionEndpointTask.java
index fa6c937..d80d1e5 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/VersionEndpointTask.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/VersionEndpointTask.java
@@ -122,7 +122,7 @@ public class VersionEndpointTask implements
}
} catch (DiskOutOfSpaceException ex) {
rpcEndPoint.setState(EndpointStateMachine.EndPointStates.SHUTDOWN);
- } catch(IOException ex) {
+ } catch (IOException ex) {
rpcEndPoint.logIfNeeded(ex);
} finally {
rpcEndPoint.unlock();
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
index 4ecf278..557473b 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/CSMMetrics.java
@@ -33,7 +33,7 @@ import org.apache.ratis.protocol.RaftGroupId;
* This class is for maintaining Container State Machine statistics.
*/
@InterfaceAudience.Private
-@Metrics(about="Container State Machine Metrics", context="dfs")
+@Metrics(about = "Container State Machine Metrics", context = "dfs")
public class CSMMetrics {
public static final String SOURCE_NAME =
CSMMetrics.class.getSimpleName();
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
index 301fc59..4ef5320 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
@@ -689,7 +689,7 @@ public class ContainerStateMachine extends BaseStateMachine {
private synchronized void updateLastApplied() {
Long appliedTerm = null;
long appliedIndex = -1;
- for(long i = getLastAppliedTermIndex().getIndex() + 1;; i++) {
+ for (long i = getLastAppliedTermIndex().getIndex() + 1;; i++) {
final Long removed = applyTransactionCompletionMap.remove(i);
if (removed == null) {
break;
@@ -740,7 +740,7 @@ public class ContainerStateMachine extends BaseStateMachine {
= queue.submit(task, executor);
// after the task is completed, remove the queue if the queue is empty.
f.thenAccept(dummy -> containerTaskQueues.computeIfPresent(containerId,
- (id, q) -> q.isEmpty()? null: q));
+ (id, q) -> q.isEmpty() ? null : q));
return f;
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
index c04e5e9..237b448 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
@@ -273,7 +273,7 @@ public final class XceiverServerRatis implements XceiverServerSpi {
// Set the ratis storage directory
Collection<String> storageDirPaths =
HddsServerUtil.getOzoneDatanodeRatisDirectory(conf);
- List<File> storageDirs= new ArrayList<>(storageDirPaths.size());
+ List<File> storageDirs = new ArrayList<>(storageDirPaths.size());
storageDirPaths.stream().forEach(d -> storageDirs.add(new File(d)));
RaftServerConfigKeys.setStorageDir(properties, storageDirs);
@@ -693,7 +693,7 @@ public final class XceiverServerRatis implements XceiverServerSpi {
long bytesWritten = 0;
Iterator<org.apache.hadoop.ozone.container.common.interfaces.Container<?>>
containerIt = containerController.getContainers();
- while(containerIt.hasNext()) {
+ while (containerIt.hasNext()) {
ContainerData containerData = containerIt.next().getContainerData();
if (containerData.getOriginPipelineId()
.compareTo(pipelineID.getId()) == 0) {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/utils/HddsVolumeUtil.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/utils/HddsVolumeUtil.java
index 83b8615..6a38080 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/utils/HddsVolumeUtil.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/utils/HddsVolumeUtil.java
@@ -145,7 +145,7 @@ public final class HddsVolumeUtil {
String lvStr = getProperty(props, OzoneConsts.LAYOUTVERSION, versionFile);
int lv = Integer.parseInt(lvStr);
- if(HDDSVolumeLayoutVersion.getLatestVersion().getVersion() != lv) {
+ if (HDDSVolumeLayoutVersion.getLatestVersion().getVersion() != lv) {
throw new InconsistentStorageStateException("Invalid layOutVersion. " +
"Version file has layOutVersion as " + lv + " and latest Datanode " +
"layOutVersion is " +
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MutableVolumeSet.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MutableVolumeSet.java
index 35ff05e..98e1629 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MutableVolumeSet.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MutableVolumeSet.java
@@ -290,7 +290,7 @@ public class MutableVolumeSet implements VolumeSet {
}
public void refreshAllVolumeUsage() {
- volumeMap.forEach((k, v)-> v.refreshVolumeInfo());
+ volumeMap.forEach((k, v) -> v.refreshVolumeInfo());
}
/**
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolume.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolume.java
index 5f629ad..715cb84 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolume.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolume.java
@@ -161,7 +161,7 @@ public abstract class StorageVolume
}
public StorageType getStorageType() {
- if(this.volumeInfo != null) {
+ if (this.volumeInfo != null) {
return this.volumeInfo.getStorageType();
}
return StorageType.DEFAULT;
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
index 255e7ea..1fcac83 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
@@ -87,7 +87,7 @@ public class VolumeUsage implements SpaceUsageSource {
}
}
- public void refreshNow(){
+ public void refreshNow() {
source.refreshNow();
}
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
index 1284f6a..e0ba37a 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
@@ -382,7 +382,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
private void compactDB() throws StorageContainerException {
try {
- try(ReferenceCountedDB db = BlockUtils.getDB(containerData, config)) {
+ try (ReferenceCountedDB db = BlockUtils.getDB(containerData, config)) {
db.getStore().compactDB();
}
} catch (StorageContainerException ex) {
@@ -435,7 +435,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
// holding lock and writing data to disk. We can have async implementation
// to flush the update container data to disk.
long containerId = containerData.getContainerID();
- if(!containerData.isValid()) {
+ if (!containerData.isValid()) {
LOG.debug("Invalid container data. ContainerID: {}", containerId);
throw new StorageContainerException("Invalid container data. " +
"ContainerID: " + containerId, INVALID_CONTAINER_STATE);
@@ -774,7 +774,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
* @return
* @throws IOException
*/
- private File createTempFile(File file) throws IOException{
+ private File createTempFile(File file) throws IOException {
return File.createTempFile("tmp_" + System.currentTimeMillis() + "_",
file.getName(), file.getParentFile());
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerCheck.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerCheck.java
index ab2f666..40d527d 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerCheck.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerCheck.java
@@ -230,13 +230,13 @@ public class KeyValueContainerCheck {
ContainerLayoutVersion layout = onDiskContainerData.getLayoutVersion();
- try(ReferenceCountedDB db =
+ try (ReferenceCountedDB db =
BlockUtils.getDB(onDiskContainerData, checkConfig);
BlockIterator<BlockData> kvIter = db.getStore().getBlockIterator()) {
- while(kvIter.hasNext()) {
+ while (kvIter.hasNext()) {
BlockData block = kvIter.nextBlock();
- for(ContainerProtos.ChunkInfo chunk : block.getChunks()) {
+ for (ContainerProtos.ChunkInfo chunk : block.getChunks()) {
File chunkFile = layout.getChunkFile(onDiskContainerData,
block.getBlockID(), ChunkInfo.getFromProtoBuf(chunk));
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
index f7eedf7..8133307 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
@@ -270,7 +270,7 @@ public class KeyValueContainerData extends ContainerData {
builder.setBytesUsed(this.getBytesUsed());
}
- if(this.getContainerType() != null) {
+ if (this.getContainerType() != null) {
builder.setContainerType(ContainerProtos.ContainerType.KeyValueContainer);
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
index 4760078..ff2d061 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
@@ -194,7 +194,7 @@ public class KeyValueHandler extends Handler {
DispatcherContext dispatcherContext) {
Type cmdType = request.getCmdType();
- switch(cmdType) {
+ switch (cmdType) {
case CreateContainer:
return handler.handleCreateContainer(request, kvContainer);
case ReadContainer:
@@ -744,7 +744,7 @@ public class KeyValueHandler extends Handler {
.writeChunk(kvContainer, blockID, chunkInfo, data, dispatcherContext);
// We should increment stats after writeChunk
- if (stage == WriteChunkStage.WRITE_DATA||
+ if (stage == WriteChunkStage.WRITE_DATA ||
stage == WriteChunkStage.COMBINED) {
metrics.incContainerBytesStats(Type.WriteChunk, writeChunk
.getChunkData().getLen());
@@ -959,7 +959,7 @@ public class KeyValueHandler extends Handler {
public void exportContainer(final Container container,
final OutputStream outputStream,
final TarContainerPacker packer)
- throws IOException{
+ throws IOException {
final KeyValueContainer kvc = (KeyValueContainer) container;
kvc.exportContainerData(outputStream, packer);
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerLocationUtil.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerLocationUtil.java
index ad1673a..dde3e2e 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerLocationUtil.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerLocationUtil.java
@@ -97,7 +97,7 @@ public final class KeyValueContainerLocationUtil {
* @param containerId
* @return container sub directory
*/
- private static String getContainerSubDirectory(long containerId){
+ private static String getContainerSubDirectory(long containerId) {
int directory = (int) ((containerId >> 9) & 0xFF);
return Storage.CONTAINER_DIR + directory;
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java
index 58a0dcd..8256d0a 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java
@@ -119,7 +119,7 @@ public class BlockManagerImpl implements BlockManager {
"cannot be negative");
// We are not locking the key manager since LevelDb serializes all actions
// against a single DB. We rely on DB level locking to avoid conflicts.
- try(ReferenceCountedDB db = BlockUtils.
+ try (ReferenceCountedDB db = BlockUtils.
getDB(container.getContainerData(), config)) {
// This is a post condition that acts as a hint to the user.
// Should never fail.
@@ -216,7 +216,7 @@ public class BlockManagerImpl implements BlockManager {
+ containerBCSId + ".", UNKNOWN_BCSID);
}
- try(ReferenceCountedDB db = BlockUtils.getDB(containerData, config)) {
+ try (ReferenceCountedDB db = BlockUtils.getDB(containerData, config)) {
// This is a post condition that acts as a hint to the user.
// Should never fail.
Preconditions.checkNotNull(db, DB_NULL_ERR_MSG);
@@ -244,7 +244,7 @@ public class BlockManagerImpl implements BlockManager {
throws IOException {
KeyValueContainerData containerData = (KeyValueContainerData) container
.getContainerData();
- try(ReferenceCountedDB db = BlockUtils.getDB(containerData, config)) {
+ try (ReferenceCountedDB db = BlockUtils.getDB(containerData, config)) {
// This is a post condition that acts as a hint to the user.
// Should never fail.
Preconditions.checkNotNull(db, DB_NULL_ERR_MSG);
@@ -276,7 +276,7 @@ public class BlockManagerImpl implements BlockManager {
KeyValueContainerData cData = (KeyValueContainerData) container
.getContainerData();
- try(ReferenceCountedDB db = BlockUtils.getDB(cData, config)) {
+ try (ReferenceCountedDB db = BlockUtils.getDB(cData, config)) {
// This is a post condition that acts as a hint to the user.
// Should never fail.
Preconditions.checkNotNull(db, DB_NULL_ERR_MSG);
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java
index 905918a..d40afc5 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java
@@ -351,7 +351,7 @@ public class BlockDeletingService extends BackgroundService {
}
// Once blocks are deleted... remove the blockID from blockDataTable.
- try(BatchOperation batch = meta.getStore().getBatchHandler()
+ try (BatchOperation batch = meta.getStore().getBatchHandler()
.initBatchOperation()) {
for (String entry : succeedBlocks) {
blockDataTable.deleteWithBatch(batch, entry);
@@ -426,7 +426,7 @@ public class BlockDeletingService extends BackgroundService {
// Once blocks are deleted... remove the blockID from blockDataTable
// and also remove the transactions from txnTable.
- try(BatchOperation batch = meta.getStore().getBatchHandler()
+ try (BatchOperation batch = meta.getStore().getBatchHandler()
.initBatchOperation()) {
for (DeletedBlocksTransaction delTx : delBlocks) {
deleteTxns.deleteWithBatch(batch, delTx.getTxID());
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractDatanodeStore.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractDatanodeStore.java
index 15a8a9e..a3049be 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractDatanodeStore.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractDatanodeStore.java
@@ -276,7 +276,7 @@ public abstract class AbstractDatanodeStore implements DatanodeStore {
nextBlock = null;
return currentBlock;
}
- if(hasNext()) {
+ if (hasNext()) {
return nextBlock();
}
throw new NoSuchElementException("Block Iterator reached end for " +
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerDataScrubberMetrics.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerDataScrubberMetrics.java
index 4a20dc3..c924485 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerDataScrubberMetrics.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerDataScrubberMetrics.java
@@ -32,7 +32,7 @@ import java.util.concurrent.ThreadLocalRandom;
* This class captures the container data scrubber metrics on the data-node.
**/
@InterfaceAudience.Private
-@Metrics(about="DataNode container data scrubber metrics", context="dfs")
+@Metrics(about = "DataNode container data scrubber metrics", context = "dfs")
public final class ContainerDataScrubberMetrics {
private final String name;
@@ -110,8 +110,8 @@ public final class ContainerDataScrubberMetrics {
public static ContainerDataScrubberMetrics create(final String volumeName) {
MetricsSystem ms = DefaultMetricsSystem.instance();
- String name = "ContainerDataScrubberMetrics-"+ (volumeName.isEmpty()
- ? "UndefinedDataNodeVolume"+ ThreadLocalRandom.current().nextInt()
+ String name = "ContainerDataScrubberMetrics-" + (volumeName.isEmpty()
+ ? "UndefinedDataNodeVolume" + ThreadLocalRandom.current().nextInt()
: volumeName.replace(':', '-'));
return ms.register(name, null, new ContainerDataScrubberMetrics(name, ms));
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerMetadataScanner.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerMetadataScanner.java
index 96efcf4..59657b0 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerMetadataScanner.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerMetadataScanner.java
@@ -90,7 +90,7 @@ public class ContainerMetadataScanner extends Thread {
metrics.incNumContainersScanned();
}
}
- long interval = System.nanoTime()-start;
+ long interval = System.nanoTime() - start;
if (!stopping) {
metrics.incNumScanIterations();
LOG.info("Completed an iteration of container metadata scrubber in" +
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerMetadataScrubberMetrics.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerMetadataScrubberMetrics.java
index cf8e617..b70a3e5 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerMetadataScrubberMetrics.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerMetadataScrubberMetrics.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.metrics2.lib.MutableGaugeInt;
* data-node.
**/
@InterfaceAudience.Private
-@Metrics(about="DataNode container data scrubber metrics", context="dfs")
+@Metrics(about = "DataNode container data scrubber metrics", context = "dfs")
public final class ContainerMetadataScrubberMetrics {
private final String name;
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
index 91c7400..023b251 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcReplicationClient.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
/**
* Client to read container data from gRPC.
*/
-public class GrpcReplicationClient implements AutoCloseable{
+public class GrpcReplicationClient implements AutoCloseable {
private static final Logger LOG =
LoggerFactory.getLogger(GrpcReplicationClient.class);
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/DirstreamClientHandler.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/DirstreamClientHandler.java
index e14a391..fc9b449 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/DirstreamClientHandler.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/DirstreamClientHandler.java
@@ -116,7 +116,7 @@ public class DirstreamClientHandler extends ChannelInboundHandlerAdapter {
}
}
- public boolean isAtTheEnd(){
+ public boolean isAtTheEnd() {
return getCurrentFileName().equals(END_MARKER);
}
@Override
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java
index 9ff4b0a..f25e13c 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/DataNodeUpgradeFinalizer.java
@@ -46,7 +46,7 @@ public class DataNodeUpgradeFinalizer extends
@Override
public void preFinalizeUpgrade(DatanodeStateMachine dsm)
throws IOException {
- if(!canFinalizeDataNode(dsm)) {
+ if (!canFinalizeDataNode(dsm)) {
// DataNode is not yet ready to finalize.
// Reset the Finalization state.
getVersionManager().setUpgradeState(FINALIZATION_REQUIRED);
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/VersionedDatanodeFeatures.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/VersionedDatanodeFeatures.java
index ec84946..3653e6c 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/VersionedDatanodeFeatures.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/VersionedDatanodeFeatures.java
@@ -120,7 +120,7 @@ public final class VersionedDatanodeFeatures {
boolean scmHAEnabled =
conf.getBoolean(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY,
ScmConfigKeys.OZONE_SCM_HA_ENABLE_DEFAULT);
- if (isFinalized(HDDSLayoutFeature.SCM_HA) || scmHAEnabled){
+ if (isFinalized(HDDSLayoutFeature.SCM_HA) || scmHAEnabled) {
return clusterID;
} else {
return scmID;
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReregisterCommand.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReregisterCommand.java
index e3ea4ae..6aa0554 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReregisterCommand.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/ReregisterCommand.java
@@ -27,7 +27,7 @@ import static org.apache.hadoop.hdds.protocol.proto
* Informs a datanode to register itself with SCM again.
*/
public class ReregisterCommand extends
- SCMCommand<ReregisterCommandProto>{
+ SCMCommand<ReregisterCommandProto> {
/**
* Returns the type of this command.
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java
index 08ca4c9..6deadda 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java
@@ -114,7 +114,7 @@ public class TestHddsSecureDatanodeInit {
}
@Before
- public void setUpDNCertClient(){
+ public void setUpDNCertClient() {
FileUtils.deleteQuietly(Paths.get(
securityConfig.getKeyLocation(DN_COMPONENT).toString(),
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ScmTestMock.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ScmTestMock.java
index 157dee6..eef6655 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ScmTestMock.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ScmTestMock.java
@@ -131,9 +131,10 @@ public class ScmTestMock implements StorageContainerDatanodeProtocol {
* @return - count of reported containers.
*/
public long getContainerCount() {
- return nodeContainers.values().parallelStream().mapToLong((containerMap)->{
- return containerMap.size();
- }).sum();
+ return nodeContainers.values().parallelStream().mapToLong(
+ (containerMap) -> {
+ return containerMap.size();
+ }).sum();
}
/**
@@ -141,11 +142,13 @@ public class ScmTestMock implements StorageContainerDatanodeProtocol {
* @return - number of keys reported.
*/
public long getKeyCount() {
- return nodeContainers.values().parallelStream().mapToLong((containerMap)->{
- return containerMap.values().parallelStream().mapToLong((container) -> {
- return container.getKeyCount();
- }).sum();
- }).sum();
+ return nodeContainers.values().parallelStream().mapToLong(
+ (containerMap) -> {
+ return containerMap.values().parallelStream().mapToLong(
+ (container) -> {
+ return container.getKeyCount();
+ }).sum();
+ }).sum();
}
/**
@@ -153,11 +156,13 @@ public class ScmTestMock implements StorageContainerDatanodeProtocol {
* @return - number of bytes used.
*/
public long getBytesUsed() {
- return nodeContainers.values().parallelStream().mapToLong((containerMap)->{
- return containerMap.values().parallelStream().mapToLong((container) -> {
- return container.getUsed();
- }).sum();
- }).sum();
+ return nodeContainers.values().parallelStream().mapToLong(
+ (containerMap) -> {
+ return containerMap.values().parallelStream().mapToLong(
+ (container) -> {
+ return container.getUsed();
+ }).sum();
+ }).sum();
}
/**
@@ -259,7 +264,7 @@ public class ScmTestMock implements StorageContainerDatanodeProtocol {
List<StorageReportProto> storageReports =
nodeReport.getStorageReportList();
- for(StorageReportProto report : storageReports) {
+ for (StorageReportProto report : storageReports) {
nodeReportProto.addStorageReport(report);
}
@@ -313,7 +318,7 @@ public class ScmTestMock implements StorageContainerDatanodeProtocol {
public int getContainerCountsForDatanode(DatanodeDetails datanodeDetails) {
Map<String, ContainerReplicaProto> cr =
nodeContainers.get(datanodeDetails);
- if(cr != null) {
+ if (cr != null) {
return cr.size();
}
return 0;
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
index 014913e..5306eb0 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
@@ -356,7 +356,8 @@ public class TestBlockDeletingService {
.put(OzoneConsts.PENDING_DELETE_BLOCK_COUNT,
(long) numOfBlocksPerContainer);
} catch (IOException exception) {
- LOG.warn("Meta Data update was not successful for container: "+container);
+ LOG.warn("Meta Data update was not successful for container: "
+ + container);
}
}
@@ -427,7 +428,7 @@ public class TestBlockDeletingService {
KeyValueContainerData data = (KeyValueContainerData) containerData.get(0);
Assert.assertEquals(1, containerData.size());
- try(ReferenceCountedDB meta = BlockUtils.getDB(
+ try (ReferenceCountedDB meta = BlockUtils.getDB(
(KeyValueContainerData) containerData.get(0), conf)) {
Map<Long, Container<?>> containerMap = containerSet.getContainerMapCopy();
// NOTE: this test assumes that all the container is KetValueContainer and
@@ -734,7 +735,7 @@ public class TestBlockDeletingService {
// in all the containers are deleted)).
deleteAndWait(service, 2);
- long totalContainerBlocks = blocksPerContainer*containerCount;
+ long totalContainerBlocks = blocksPerContainer * containerCount;
GenericTestUtils.waitFor(() ->
totalContainerBlocks * blockSpace ==
(totalContainerSpace -
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestContainerCache.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestContainerCache.java
index 562775d..e55d68c 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestContainerCache.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestContainerCache.java
@@ -177,7 +177,7 @@ public class TestContainerCache {
for (Future future: futureList) {
try {
future.get();
- } catch (InterruptedException| ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
Assert.fail("Should get the DB instance");
}
}
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaOneBackwardsCompatibility.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaOneBackwardsCompatibility.java
index 700c6c2..c8bb93b 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaOneBackwardsCompatibility.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaOneBackwardsCompatibility.java
@@ -130,7 +130,8 @@ public class TestSchemaOneBackwardsCompatibility {
*/
@Test
public void testDirectTableIterationDisabled() throws Exception {
- try(ReferenceCountedDB refCountedDB = BlockUtils.getDB(newKvData(), conf)) {
+ try (ReferenceCountedDB refCountedDB =
+ BlockUtils.getDB(newKvData(), conf)) {
DatanodeStore store = refCountedDB.getStore();
assertTableIteratorUnsupported(store.getMetadataTable());
@@ -158,7 +159,8 @@ public class TestSchemaOneBackwardsCompatibility {
*/
@Test
public void testBlockIteration() throws IOException {
- try(ReferenceCountedDB refCountedDB = BlockUtils.getDB(newKvData(), conf)) {
+ try (ReferenceCountedDB refCountedDB =
+ BlockUtils.getDB(newKvData(), conf)) {
assertEquals(TestDB.NUM_DELETED_BLOCKS, countDeletedBlocks(refCountedDB));
assertEquals(TestDB.NUM_PENDING_DELETION_BLOCKS,
@@ -278,7 +280,8 @@ public class TestSchemaOneBackwardsCompatibility {
final long expectedRegularBlocks =
TestDB.KEY_COUNT - numBlocksToDelete;
- try(ReferenceCountedDB refCountedDB = BlockUtils.getDB(newKvData(), conf)) {
+ try (ReferenceCountedDB refCountedDB =
+ BlockUtils.getDB(newKvData(), conf)) {
// Test results via block iteration.
assertEquals(expectedDeletingBlocks,
@@ -320,7 +323,8 @@ public class TestSchemaOneBackwardsCompatibility {
new KeyValueHandler(conf, datanodeUuid, containerSet, volumeSet,
metrics, c -> {
});
- try(ReferenceCountedDB refCountedDB = BlockUtils.getDB(newKvData(), conf)) {
+ try (ReferenceCountedDB refCountedDB =
+ BlockUtils.getDB(newKvData(), conf)) {
// Read blocks that were already deleted before the upgrade.
List<? extends Table.KeyValue<String, ChunkInfoList>> deletedBlocks =
refCountedDB.getStore()
@@ -328,13 +332,13 @@ public class TestSchemaOneBackwardsCompatibility {
Set<String> preUpgradeBlocks = new HashSet<>();
- for(Table.KeyValue<String, ChunkInfoList> chunkListKV: deletedBlocks) {
+ for (Table.KeyValue<String, ChunkInfoList> chunkListKV: deletedBlocks) {
preUpgradeBlocks.add(chunkListKV.getKey());
try {
chunkListKV.getValue();
Assert.fail("No exception thrown when trying to retrieve old " +
"deleted blocks values as chunk lists.");
- } catch(IOException ex) {
+ } catch (IOException ex) {
// Exception thrown as expected.
}
}
@@ -370,7 +374,8 @@ public class TestSchemaOneBackwardsCompatibility {
@Test
public void testReadBlockData() throws Exception {
- try(ReferenceCountedDB refCountedDB = BlockUtils.getDB(newKvData(), conf)) {
+ try (ReferenceCountedDB refCountedDB =
+ BlockUtils.getDB(newKvData(), conf)) {
Table<String, BlockData> blockDataTable =
refCountedDB.getStore().getBlockDataTable();
@@ -395,12 +400,12 @@ public class TestSchemaOneBackwardsCompatibility {
Assert.assertEquals(TestDB.BLOCK_IDS, decodedKeys);
// Test reading blocks with block iterator.
- try(BlockIterator<BlockData> iter =
+ try (BlockIterator<BlockData> iter =
refCountedDB.getStore().getBlockIterator()) {
List<String> iteratorBlockIDs = new ArrayList<>();
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
long localID = iter.nextBlock().getBlockID().getLocalID();
iteratorBlockIDs.add(Long.toString(localID));
}
@@ -412,7 +417,8 @@ public class TestSchemaOneBackwardsCompatibility {
@Test
public void testReadDeletingBlockData() throws Exception {
- try(ReferenceCountedDB refCountedDB = BlockUtils.getDB(newKvData(), conf)) {
+ try (ReferenceCountedDB refCountedDB =
+ BlockUtils.getDB(newKvData(), conf)) {
Table<String, BlockData> blockDataTable =
refCountedDB.getStore().getBlockDataTable();
@@ -446,12 +452,12 @@ public class TestSchemaOneBackwardsCompatibility {
MetadataKeyFilters.KeyPrefixFilter filter =
MetadataKeyFilters.getDeletingKeyFilter();
- try(BlockIterator<BlockData> iter =
+ try (BlockIterator<BlockData> iter =
refCountedDB.getStore().getBlockIterator(filter)) {
List<String> iteratorBlockIDs = new ArrayList<>();
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
long localID = iter.nextBlock().getBlockID().getLocalID();
iteratorBlockIDs.add(Long.toString(localID));
}
@@ -463,7 +469,8 @@ public class TestSchemaOneBackwardsCompatibility {
@Test
public void testReadMetadata() throws Exception {
- try(ReferenceCountedDB refCountedDB = BlockUtils.getDB(newKvData(), conf)) {
+ try (ReferenceCountedDB refCountedDB =
+ BlockUtils.getDB(newKvData(), conf)) {
Table<String, Long> metadataTable =
refCountedDB.getStore().getMetadataTable();
@@ -479,7 +486,8 @@ public class TestSchemaOneBackwardsCompatibility {
@Test
public void testReadDeletedBlocks() throws Exception {
- try(ReferenceCountedDB refCountedDB = BlockUtils.getDB(newKvData(), conf)) {
+ try (ReferenceCountedDB refCountedDB =
+ BlockUtils.getDB(newKvData(), conf)) {
Table<String, ChunkInfoList> deletedBlocksTable =
refCountedDB.getStore().getDeletedBlocksTable();
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestBlockData.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestBlockData.java
index 00f68ef..85a8bda 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestBlockData.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestBlockData.java
@@ -60,11 +60,11 @@ public class TestBlockData {
assertChunks(expected, computed);
long offset = 0;
int n = 5;
- for(int i = 0; i < n; i++) {
+ for (int i = 0; i < n; i++) {
offset += assertAddChunk(expected, computed, offset);
}
- for(; !expected.isEmpty();) {
+ for (; !expected.isEmpty();) {
removeChunk(expected, computed);
}
}
@@ -125,7 +125,7 @@ public class TestBlockData {
assertChunks(expected, computed);
long offset = 0;
int n = 5;
- for(int i = 0; i < n; i++) {
+ for (int i = 0; i < n; i++) {
offset += addChunk(expected, offset).getLen();
LOG.info("setChunk: {}", toString(expected));
computed.setChunks(expected);
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeVersionFile.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeVersionFile.java
index 84f5008..1ca9f9e 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeVersionFile.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeVersionFile.java
@@ -50,7 +50,7 @@ public class TestDatanodeVersionFile {
private int lv;
@Rule
- public TemporaryFolder folder= new TemporaryFolder();
+ public TemporaryFolder folder = new TemporaryFolder();
@Before
public void setup() throws IOException {
@@ -70,7 +70,7 @@ public class TestDatanodeVersionFile {
}
@Test
- public void testCreateAndReadVersionFile() throws IOException{
+ public void testCreateAndReadVersionFile() throws IOException {
//Check VersionFile exists
assertTrue(versionFile.exists());
@@ -88,7 +88,7 @@ public class TestDatanodeVersionFile {
}
@Test
- public void testIncorrectClusterId() throws IOException{
+ public void testIncorrectClusterId() throws IOException {
try {
String randomClusterID = UUID.randomUUID().toString();
HddsVolumeUtil.getClusterID(properties, versionFile,
@@ -100,7 +100,7 @@ public class TestDatanodeVersionFile {
}
@Test
- public void testVerifyCTime() throws IOException{
+ public void testVerifyCTime() throws IOException {
long invalidCTime = -10;
dnVersionFile = new DatanodeVersionFile(
storageID, clusterID, datanodeUUID, invalidCTime, lv);
@@ -117,7 +117,7 @@ public class TestDatanodeVersionFile {
}
@Test
- public void testVerifyLayOut() throws IOException{
+ public void testVerifyLayOut() throws IOException {
int invalidLayOutVersion = 100;
dnVersionFile = new DatanodeVersionFile(
storageID, clusterID, datanodeUUID, cTime, invalidLayOutVersion);
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDataYaml.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDataYaml.java
index 70efc40..0bfdb17 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDataYaml.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDataYaml.java
@@ -174,7 +174,7 @@ public class TestContainerDataYaml {
}
@Test
- public void testIncorrectContainerFile() throws IOException{
+ public void testIncorrectContainerFile() throws IOException {
try {
String containerFile = "incorrect.container";
//Get file from resources folder
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerSet.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerSet.java
index 4cb3094..d51d78e 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerSet.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerSet.java
@@ -122,11 +122,11 @@ public class TestContainerSet {
Iterator<Container<?>> iterator = containerSet.getContainerIterator();
int count = 0;
- while(iterator.hasNext()) {
+ while (iterator.hasNext()) {
Container kv = iterator.next();
ContainerData containerData = kv.getContainerData();
long containerId = containerData.getContainerID();
- if (containerId%2 == 0) {
+ if (containerId % 2 == 0) {
assertEquals(ContainerProtos.ContainerDataProto.State.CLOSED,
containerData.getState());
} else {
@@ -146,7 +146,7 @@ public class TestContainerSet {
Container kv = containerMapIterator.next().getValue();
ContainerData containerData = kv.getContainerData();
long containerId = containerData.getContainerID();
- if (containerId%2 == 0) {
+ if (containerId % 2 == 0) {
assertEquals(ContainerProtos.ContainerDataProto.State.CLOSED,
containerData.getState());
} else {
@@ -167,12 +167,12 @@ public class TestContainerSet {
Mockito.when(vol2.getStorageID()).thenReturn("uuid-2");
ContainerSet containerSet = new ContainerSet();
- for (int i=0; i<10; i++) {
+ for (int i = 0; i < 10; i++) {
KeyValueContainerData kvData = new KeyValueContainerData(i,
layout,
(long) StorageUnit.GB.toBytes(5), UUID.randomUUID().toString(),
UUID.randomUUID().toString());
- if (i%2 == 0) {
+ if (i % 2 == 0) {
kvData.setVolume(vol1);
} else {
kvData.setVolume(vol2);
@@ -307,7 +307,7 @@ public class TestContainerSet {
layout,
(long) StorageUnit.GB.toBytes(5), UUID.randomUUID().toString(),
UUID.randomUUID().toString());
- if (i%2 == 0) {
+ if (i % 2 == 0) {
kvData.setState(ContainerProtos.ContainerDataProto.State.CLOSED);
} else {
kvData.setState(ContainerProtos.ContainerDataProto.State.OPEN);
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
index 64813de..9b8da36 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java
@@ -83,7 +83,7 @@ import static org.mockito.Mockito.verify;
public class TestHddsDispatcher {
public static final Consumer<ContainerReplicaProto> NO_OP_ICR_SENDER =
- c -> {};
+ c -> { };
private final ContainerLayoutVersion layout;
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
index f969148..2b1bc3d 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
@@ -82,7 +82,7 @@ public class TestHandler {
}
@After
- public void tearDown(){
+ public void tearDown() {
ContainerMetrics.remove();
}
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java
index 83e44d3..f2770d2 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java
@@ -198,7 +198,7 @@ public class TestReportPublisher {
GeneratedMessage report =
((CRLStatusReportPublisher) publisher).getReport();
Assert.assertNotNull(report);
- for(Descriptors.FieldDescriptor descriptor :
+ for (Descriptors.FieldDescriptor descriptor :
report.getDescriptorForType().getFields()) {
if (descriptor.getNumber() ==
CRLStatusReport.RECEIVEDCRLID_FIELD_NUMBER) {
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerCommandHandler.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerCommandHandler.java
index 791d6e0..de99681 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerCommandHandler.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerCommandHandler.java
@@ -214,7 +214,7 @@ public class TestCloseContainerCommandHandler {
} catch (IOException e) {
GenericTestUtils.assertExceptionContains("The Container " +
- "is not found. ContainerID: "+containerID, e);
+ "is not found. ContainerID: " + containerID, e);
}
}
@@ -227,7 +227,7 @@ public class TestCloseContainerCommandHandler {
} catch (IOException e) {
GenericTestUtils.assertExceptionContains("The Container is in " +
"the MissingContainerSet hence we can't close it. " +
- "ContainerID: "+containerID, e);
+ "ContainerID: " + containerID, e);
}
}
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestRoundRobinVolumeChoosingPolicy.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestRoundRobinVolumeChoosingPolicy.java
index 990d4c9..dfe7cb3 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestRoundRobinVolumeChoosingPolicy.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestRoundRobinVolumeChoosingPolicy.java
@@ -114,7 +114,7 @@ public class TestRoundRobinVolumeChoosingPolicy {
try {
policy.chooseVolume(volumes, blockSize);
Assert.fail("expected to throw DiskOutOfSpaceException");
- } catch(DiskOutOfSpaceException e) {
+ } catch (DiskOutOfSpaceException e) {
Assert.assertEquals("Not returning the expected message",
"Out of space: The volume with the most available space (=" + 200
+ " B) is less than the container size (=" + blockSize + " B).",
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java
index 52bf3d3..f0869c9 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java
@@ -225,7 +225,7 @@ public class TestVolumeSet {
}
@Test
- public void testFailVolumes() throws Exception{
+ public void testFailVolumes() throws Exception {
MutableVolumeSet volSet = null;
File readOnlyVolumePath = new File(baseDir);
//Set to readonly, so that this volume will be failed
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueBlockIterator.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueBlockIterator.java
index 81d230f..fbf39f7 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueBlockIterator.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueBlockIterator.java
@@ -120,7 +120,7 @@ public class TestKeyValueBlockIterator {
// Default filter used is all unprefixed blocks.
List<Long> unprefixedBlockIDs = blockIDs.get("");
- try(BlockIterator<BlockData> keyValueBlockIterator =
+ try (BlockIterator<BlockData> keyValueBlockIterator =
db.getStore().getBlockIterator()) {
Iterator<Long> blockIDIter = unprefixedBlockIDs.iterator();
@@ -152,7 +152,7 @@ public class TestKeyValueBlockIterator {
@Test
public void testKeyValueBlockIteratorWithNextBlock() throws Exception {
List<Long> blockIDs = createContainerWithBlocks(CONTAINER_ID, 2);
- try(BlockIterator<BlockData> keyValueBlockIterator =
+ try (BlockIterator<BlockData> keyValueBlockIterator =
db.getStore().getBlockIterator()) {
assertEquals((long)blockIDs.get(0),
keyValueBlockIterator.nextBlock().getLocalID());
@@ -171,7 +171,7 @@ public class TestKeyValueBlockIterator {
@Test
public void testKeyValueBlockIteratorWithHasNext() throws Exception {
List<Long> blockIDs = createContainerWithBlocks(CONTAINER_ID, 2);
- try(BlockIterator<BlockData> blockIter =
+ try (BlockIterator<BlockData> blockIter =
db.getStore().getBlockIterator()) {
// Even calling multiple times hasNext() should not move entry forward.
@@ -209,7 +209,7 @@ public class TestKeyValueBlockIterator {
int deletingBlocks = 5;
Map<String, List<Long>> blockIDs = createContainerWithBlocks(CONTAINER_ID,
normalBlocks, deletingBlocks);
- try(BlockIterator<BlockData> keyValueBlockIterator =
+ try (BlockIterator<BlockData> keyValueBlockIterator =
db.getStore().getBlockIterator(
MetadataKeyFilters.getDeletingKeyFilter())) {
List<Long> deletingBlockIDs =
@@ -230,7 +230,7 @@ public class TestKeyValueBlockIterator {
public void testKeyValueBlockIteratorWithOnlyDeletedBlocks() throws
Exception {
createContainerWithBlocks(CONTAINER_ID, 0, 5);
- try(BlockIterator<BlockData> keyValueBlockIterator =
+ try (BlockIterator<BlockData> keyValueBlockIterator =
db.getStore().getBlockIterator()) {
//As all blocks are deleted blocks, blocks does not match with normal key
// filter.
@@ -288,7 +288,7 @@ public class TestKeyValueBlockIterator {
*/
private void testWithFilter(MetadataKeyFilters.KeyPrefixFilter filter,
List<Long> expectedIDs) throws Exception {
- try(BlockIterator<BlockData> iterator =
+ try (BlockIterator<BlockData> iterator =
db.getStore().getBlockIterator(filter)) {
// Test seek.
iterator.seekToFirst();
@@ -364,7 +364,7 @@ public class TestKeyValueBlockIterator {
Map<String, Integer> prefixCounts) throws Exception {
// Create required block data.
Map<String, List<Long>> blockIDs = new HashMap<>();
- try(ReferenceCountedDB metadataStore = BlockUtils.getDB(containerData,
+ try (ReferenceCountedDB metadataStore = BlockUtils.getDB(containerData,
conf)) {
List<ContainerProtos.ChunkInfo> chunkList = new ArrayList<>();
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
index 98b8626..1616572 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
@@ -446,7 +446,7 @@ public class TestKeyValueContainer {
keyValueContainerData, CONF);
keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId);
- try(ReferenceCountedDB db =
+ try (ReferenceCountedDB db =
BlockUtils.getDB(keyValueContainerData, CONF)) {
RDBStore store = (RDBStore) db.getStore().getStore();
long defaultCacheSize = 64 * OzoneConsts.MB;
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
index 8f1e76d..d50a091 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
@@ -186,7 +186,7 @@ import static org.junit.Assert.assertFalse;
try (RandomAccessFile file = new RandomAccessFile(chunkFile, "rws")) {
file.setLength(length / 2);
}
- assertEquals(length/2, chunkFile.length());
+ assertEquals(length / 2, chunkFile.length());
}
// metadata check should pass.
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
index 134477b..a5d2254 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
@@ -261,7 +261,7 @@ public class TestKeyValueHandler {
}
@Test
- public void testVolumeSetInKeyValueHandler() throws Exception{
+ public void testVolumeSetInKeyValueHandler() throws Exception {
File path = GenericTestUtils.getRandomizedTestDir();
OzoneConfiguration conf = new OzoneConfiguration();
conf.set(HDDS_DATANODE_DIR_KEY, path.getAbsolutePath());
@@ -296,7 +296,7 @@ public class TestKeyValueHandler {
try {
new KeyValueHandler(conf,
context.getParent().getDatanodeDetails().getUuidString(),
- cset, volumeSet, metrics, c->{});
+ cset, volumeSet, metrics, c -> { });
} catch (RuntimeException ex) {
GenericTestUtils.assertExceptionContains("class org.apache.hadoop" +
".ozone.container.common.impl.HddsDispatcher not org.apache" +
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/impl/CommonChunkManagerTestCases.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/impl/CommonChunkManagerTestCases.java
index 23f690e..defc02e 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/impl/CommonChunkManagerTestCases.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/impl/CommonChunkManagerTestCases.java
@@ -214,7 +214,7 @@ public abstract class CommonChunkManagerTestCases
BlockData blockData = new BlockData(blockID);
// WHEN
- for (int i = 0; i< count; i++) {
+ for (int i = 0; i < count; i++) {
ChunkInfo info = new ChunkInfo(String.format("%d.data.%d", localID, i),
i * len, len);
chunkManager.writeChunk(container, blockID, info, data, context);
@@ -228,7 +228,7 @@ public abstract class CommonChunkManagerTestCases
assertTrue(getHddsVolume().getVolumeIOStats().getWriteTime() > 0);
// WHEN
- for (int i = 0; i< count; i++) {
+ for (int i = 0; i < count; i++) {
ChunkInfo info = new ChunkInfo(String.format("%d.data.%d", localID, i),
i * len, len);
chunkManager.readChunk(container, blockID, info, context);
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerReader.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerReader.java
index d3e5757..674ae2d 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerReader.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerReader.java
@@ -94,7 +94,7 @@ public class TestContainerReader {
Mockito.when(volumeChoosingPolicy.chooseVolume(anyList(), anyLong()))
.thenReturn(hddsVolume);
- for (int i=0; i<2; i++) {
+ for (int i = 0; i < 2; i++) {
KeyValueContainerData keyValueContainerData = new KeyValueContainerData(i,
ContainerLayoutVersion.FILE_PER_BLOCK,
(long) StorageUnit.GB.toBytes(5), UUID.randomUUID().toString(),
@@ -124,7 +124,7 @@ public class TestContainerReader {
private void markBlocksForDelete(KeyValueContainer keyValueContainer,
boolean setMetaData, List<Long> blockNames, int count) throws Exception {
- try(ReferenceCountedDB metadataStore = BlockUtils.getDB(keyValueContainer
+ try (ReferenceCountedDB metadataStore = BlockUtils.getDB(keyValueContainer
.getContainerData(), conf)) {
for (int i = 0; i < count; i++) {
@@ -154,7 +154,7 @@ public class TestContainerReader {
long containerId = keyValueContainer.getContainerData().getContainerID();
List<Long> blkNames = new ArrayList<>();
- try(ReferenceCountedDB metadataStore = BlockUtils.getDB(keyValueContainer
+ try (ReferenceCountedDB metadataStore = BlockUtils.getDB(keyValueContainer
.getContainerData(), conf)) {
for (int i = 0; i < blockCount; i++) {
@@ -197,7 +197,7 @@ public class TestContainerReader {
Assert.assertEquals(2, containerSet.containerCount());
- for (int i=0; i < 2; i++) {
+ for (int i = 0; i < 2; i++) {
Container keyValueContainer = containerSet.getContainer(i);
KeyValueContainerData keyValueContainerData = (KeyValueContainerData)
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestGrpcOutputStream.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestGrpcOutputStream.java
index cf6ece3..099ca9c 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestGrpcOutputStream.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestGrpcOutputStream.java
@@ -126,18 +126,18 @@ public class TestGrpcOutputStream {
public void bufferFlushedWhenFull() throws IOException {
byte[] bytes = getRandomBytes(bufferSize);
- subject.write(bytes, 0, bufferSize-1);
- subject.write(bytes[bufferSize-1]);
+ subject.write(bytes, 0, bufferSize - 1);
+ subject.write(bytes[bufferSize - 1]);
verify(observer).onNext(any());
subject.write(bytes[0]);
- subject.write(bytes, 1, bufferSize-1);
+ subject.write(bytes, 1, bufferSize - 1);
verify(observer, times(2)).onNext(any());
}
@Test
public void singleArraySpansMultipleResponses() throws IOException {
- byte[] bytes = writeBytes(subject, 2 * bufferSize + bufferSize/2);
+ byte[] bytes = writeBytes(subject, 2 * bufferSize + bufferSize / 2);
subject.close();
verifyResponses(bytes);
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
index 37c5557..8078fc2 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
@@ -58,7 +58,7 @@ import static java.util.Collections.emptyList;
@RunWith(Parameterized.class)
public class TestReplicationSupervisor {
- private final ContainerReplicator noopReplicator = task -> {};
+ private final ContainerReplicator noopReplicator = task -> { };
private final ContainerReplicator throwingReplicator = task -> {
throw new RuntimeException("testing replication failure");
};
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToScmHA.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToScmHA.java
index cb5257d..d882ca4 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToScmHA.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToScmHA.java
@@ -144,7 +144,7 @@ public class TestDatanodeUpgradeToScmHA {
ExecutorService executor = Executors.newFixedThreadPool(1);
Future<Void> readFuture = executor.submit(() -> {
// Layout version check should be thread safe.
- while(!dsm.getLayoutVersionManager()
+ while (!dsm.getLayoutVersionManager()
.isAllowed(HDDSLayoutFeature.SCM_HA)) {
readChunk(writeChunk, pipeline);
}
@@ -203,7 +203,7 @@ public class TestDatanodeUpgradeToScmHA {
ExecutorService executor = Executors.newFixedThreadPool(1);
Future<Void> importFuture = executor.submit(() -> {
// Layout version check should be thread safe.
- while(!dsm.getLayoutVersionManager()
+ while (!dsm.getLayoutVersionManager()
.isAllowed(HDDSLayoutFeature.SCM_HA)) {
importContainer(exportContainerID, exportedContainerFile);
readChunk(exportWriteChunk, pipeline);
@@ -541,7 +541,7 @@ public class TestDatanodeUpgradeToScmHA {
* Get the cluster ID and SCM ID from SCM to the datanode.
*/
public void callVersionEndpointTask() throws Exception {
- try(EndpointStateMachine esm = ContainerTestUtils.createEndpoint(conf,
+ try (EndpointStateMachine esm = ContainerTestUtils.createEndpoint(conf,
address, 1000)) {
VersionEndpointTask vet = new VersionEndpointTask(esm, conf,
dsm.getContainer());
diff --git a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
index f4bfcef..2e27982 100644
--- a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
+++ b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
@@ -152,6 +152,7 @@
<module name="WhitespaceAfter">
<property name="tokens" value="COMMA, SEMI"/>
</module>
+ <module name="WhitespaceAround"/>
<!-- Modifier Checks -->
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java
index d89ecc6..14e63a1 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java
@@ -366,7 +366,7 @@ public class SCMSecurityProtocolClientSideTranslatorPB implements
.setReason(Reason.valueOf(reason))
.setRevokeTime(revocationTime).build();
return submitRequest(Type.RevokeCertificates,
- builder->builder.setRevokeCertificatesRequest(req))
+ builder -> builder.setRevokeCertificatesRequest(req))
.getRevokeCertificatesResponseProto().getCrlId();
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
index b26c0da..77ef3f0 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
@@ -332,7 +332,7 @@ public final class StorageContainerLocationProtocolClientSideTranslatorPB
response = submitRequest(Type.GetExistContainerWithPipelinesInBatch,
(builder) -> builder
.setGetExistContainerWithPipelinesInBatchRequest(request));
- } catch (IOException ex){
+ } catch (IOException ex) {
return cps;
}
@@ -781,7 +781,7 @@ public final class StorageContainerLocationProtocolClientSideTranslatorPB
Optional<Integer> maxDatanodesPercentageToInvolvePerIteration,
Optional<Long> maxSizeToMovePerIterationInGB,
Optional<Long> maxSizeEnteringTargetInGB,
- Optional<Long> maxSizeLeavingSourceInGB) throws IOException{
+ Optional<Long> maxSizeLeavingSourceInGB) throws IOException {
StartContainerBalancerRequestProto.Builder builder =
StartContainerBalancerRequestProto.newBuilder();
builder.setTraceID(TracingUtil.exportCurrentSpan());
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/CRLClientUpdateHandler.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/CRLClientUpdateHandler.java
index 6d54481..72da519 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/CRLClientUpdateHandler.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/CRLClientUpdateHandler.java
@@ -68,7 +68,7 @@ public class CRLClientUpdateHandler implements ClientUpdateHandler {
this.clientStore = serviceGrpcClient.getClientCRLStore();
this.crlCheckInterval = crlCheckInterval;
- LOG.info("Pending CRL check interval : {}s", crlCheckInterval/1000);
+ LOG.info("Pending CRL check interval : {}s", crlCheckInterval / 1000);
this.executorService = Executors.newSingleThreadScheduledExecutor(
new ThreadFactoryBuilder().setDaemon(true)
.setNameFormat("CRLUpdateHandler Thread - %d").build());
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/ClientCRLStore.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/ClientCRLStore.java
index 721988e..5e326cc 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/ClientCRLStore.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/ClientCRLStore.java
@@ -76,7 +76,7 @@ public class ClientCRLStore implements CRLStore {
public List<Long> getRevokedCertIds(X509CRL crl) {
return Collections.unmodifiableList(crl.getRevokedCertificates().stream()
- .map(cert->cert.getSerialNumber().longValue())
+ .map(cert -> cert.getSerialNumber().longValue())
.collect(Collectors.toList()));
}
@@ -91,7 +91,7 @@ public class ClientCRLStore implements CRLStore {
public List<Long> getPendingCrlIds() {
return new ArrayList<>(pendingCrls)
- .stream().map(crl->crl.getCrlSequenceID())
+ .stream().map(crl -> crl.getCrlSequenceID())
.collect(Collectors.toList());
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/SCMUpdateServiceGrpcClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/SCMUpdateServiceGrpcClient.java
index 96e1577..8b96d5c 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/SCMUpdateServiceGrpcClient.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/SCMUpdateServiceGrpcClient.java
@@ -92,7 +92,7 @@ public class SCMUpdateServiceGrpcClient {
createChannel();
}
clientId = subScribeClient();
- assert(clientId != null);
+ assert (clientId != null);
// start background thread processing pending crl ids.
handler = new CRLClientUpdateHandler(clientId, updateClient,
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/BaseApprover.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/BaseApprover.java
index 3136168..6738868 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/BaseApprover.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/BaseApprover.java
@@ -100,7 +100,7 @@ public abstract class BaseApprover implements CertificateApprover {
Objects.requireNonNull(attribute);
List<Extensions> extensionsList = new ArrayList<>();
for (ASN1Encodable value : attribute.getAttributeValues()) {
- if(value != null) {
+ if (value != null) {
Extensions extensions = Extensions.getInstance(value);
extensionsList.add(extensions);
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
index fc2a77b..83be3aa 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
@@ -228,7 +228,7 @@ public class DefaultCAServer implements CertificateServer {
CompletableFuture<X509CertificateHolder> xcertHolder =
approver.inspectCSR(csr);
- if(xcertHolder.isCompletedExceptionally()) {
+ if (xcertHolder.isCompletedExceptionally()) {
// This means that approver told us there are things which it disagrees
// with in this Certificate Request. Since the first set of sanity
// checks failed, we just return the future object right here.
@@ -324,7 +324,7 @@ public class DefaultCAServer implements CertificateServer {
public List<X509Certificate> listCertificate(NodeType role,
long startSerialId, int count, boolean isRevoked) throws IOException {
return store.listCertificate(role, BigInteger.valueOf(startSerialId), count,
- isRevoked? CertificateStore.CertType.REVOKED_CERTS :
+ isRevoked ? CertificateStore.CertType.REVOKED_CERTS :
CertificateStore.CertType.VALID_CERTS);
}
@@ -554,7 +554,7 @@ public class DefaultCAServer implements CertificateServer {
OzoneSecurityUtil.getValidInetsForCurrentHost().forEach(
ip -> {
builder.addIpAddress(ip.getHostAddress());
- if(validator.isValid(ip.getCanonicalHostName())) {
+ if (validator.isValid(ip.getCanonicalHostName())) {
builder.addDnsName(ip.getCanonicalHostName());
}
});
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultCAProfile.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultCAProfile.java
index a146c73..da799d7 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultCAProfile.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultCAProfile.java
@@ -53,7 +53,7 @@ public class DefaultCAProfile extends DefaultProfile {
PKIProfile pkiProfile) {
BasicConstraints constraints =
BasicConstraints.getInstance(ext.getParsedValue());
- if(constraints.isCA()) {
+ if (constraints.isCA()) {
if (pkiProfile.isCA()) {
return true;
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
index d831c83..d681806 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
@@ -516,7 +516,7 @@ public abstract class DefaultCertificateClient implements CertificateClient {
OzoneSecurityUtil.getValidInetsForCurrentHost().forEach(
ip -> {
builder.addIpAddress(ip.getHostAddress());
- if(validator.isValid(ip.getCanonicalHostName())) {
+ if (validator.isValid(ip.getCanonicalHostName())) {
builder.addDnsName(ip.getCanonicalHostName());
} else {
getLogger().error("Invalid domain {}", ip.getCanonicalHostName());
@@ -580,7 +580,7 @@ public abstract class DefaultCertificateClient implements CertificateClient {
String certName = String.format(CERT_FILE_NAME_FORMAT,
cert.getSerialNumber().toString());
- if(caCert) {
+ if (caCert) {
certName = CA_CERT_PREFIX + certName;
caCertId = cert.getSerialNumber().toString();
}
@@ -688,17 +688,17 @@ public abstract class DefaultCertificateClient implements CertificateClient {
@Override
public synchronized InitResponse init() throws CertificateException {
int initCase = 0;
- PrivateKey pvtKey= getPrivateKey();
+ PrivateKey pvtKey = getPrivateKey();
PublicKey pubKey = getPublicKey();
X509Certificate certificate = getCertificate();
- if(pvtKey != null){
- initCase = initCase | 1<<2;
+ if (pvtKey != null) {
+ initCase = initCase | 1 << 2;
}
- if(pubKey != null){
- initCase = initCase | 1<<1;
+ if (pubKey != null) {
+ initCase = initCase | 1 << 1;
}
- if(certificate != null){
+ if (certificate != null) {
initCase = initCase | 1;
}
getLogger().info("Certificate client init case: {}", initCase);
@@ -800,7 +800,7 @@ public abstract class DefaultCertificateClient implements CertificateClient {
PublicKey pubKey = getCertificate().getPublicKey();
try {
- if(validateKeyPair(pubKey)){
+ if (validateKeyPair(pubKey)) {
keyCodec.writePublicKey(pubKey);
publicKey = pubKey;
} else {
@@ -922,7 +922,7 @@ public abstract class DefaultCertificateClient implements CertificateClient {
updateCAList();
}
return pemEncodedCACerts;
- }finally {
+ } finally {
lock.unlock();
}
}
@@ -947,7 +947,7 @@ public abstract class DefaultCertificateClient implements CertificateClient {
}
@Override
- public boolean processCrl(CRLInfo crl){
+ public boolean processCrl(CRLInfo crl) {
List<String> certIds2Remove = new ArrayList();
crl.getX509CRL().getRevokedCertificates().forEach(
cert -> certIds2Remove.add(cert.getSerialNumber().toString()));
@@ -957,15 +957,15 @@ public abstract class DefaultCertificateClient implements CertificateClient {
}
- private boolean removeCertificates(List<String> certIds){
+ private boolean removeCertificates(List<String> certIds) {
lock.lock();
boolean reInitCert = false;
try {
// For now, remove self cert and ca cert is not implemented
// both requires a restart of the service.
- if ((certSerialId!=null && certIds.contains(certSerialId)) ||
- (caCertId!=null && certIds.contains(caCertId)) ||
- (rootCaCertId!=null && certIds.contains(rootCaCertId))) {
+ if ((certSerialId != null && certIds.contains(certSerialId)) ||
+ (caCertId != null && certIds.contains(caCertId)) ||
+ (rootCaCertId != null && certIds.contains(rootCaCertId))) {
reInitCert = true;
}
@@ -1004,7 +1004,7 @@ public abstract class DefaultCertificateClient implements CertificateClient {
* Set Local CRL id.
* @param crlId
*/
- public void setLocalCrlId(long crlId){
+ public void setLocalCrlId(long crlId) {
this.localCrlId = crlId;
}
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java
index 7aea596..6143bd1 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java
@@ -44,8 +44,8 @@ public class OMCertificateClient extends DefaultCertificateClient {
public OMCertificateClient(SecurityConfig securityConfig,
String certSerialId, String localCrlId) {
super(securityConfig, LOG, certSerialId, COMPONENT_NAME);
- this.setLocalCrlId(localCrlId!=null ?
- Long.parseLong(localCrlId): 0);
+ this.setLocalCrlId(localCrlId != null ?
+ Long.parseLong(localCrlId) : 0);
}
public OMCertificateClient(SecurityConfig securityConfig,
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificates/utils/CertificateSignRequest.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificates/utils/CertificateSignRequest.java
index b8d2859..ec7b5a8 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificates/utils/CertificateSignRequest.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificates/utils/CertificateSignRequest.java
@@ -117,7 +117,7 @@ public final class CertificateSignRequest {
PemObject pemObject =
new PemObject("CERTIFICATE REQUEST", request.getEncoded());
StringWriter str = new StringWriter();
- try(JcaPEMWriter pemWriter = new JcaPEMWriter(str)) {
+ try (JcaPEMWriter pemWriter = new JcaPEMWriter(str)) {
pemWriter.writeObject(pemObject);
}
return str.toString();
@@ -135,7 +135,7 @@ public final class CertificateSignRequest {
throws IOException {
try (PemReader reader = new PemReader(new StringReader(csr))) {
PemObject pemObject = reader.readPemObject();
- if(pemObject.getContent() == null) {
+ if (pemObject.getContent() == null) {
throw new SCMSecurityException("Invalid Certificate signing request",
INVALID_CSR);
}
@@ -268,10 +268,10 @@ public final class CertificateSignRequest {
private Extension getKeyUsageExtension() throws IOException {
int keyUsageFlag = KeyUsage.keyAgreement;
- if(digitalEncryption){
+ if (digitalEncryption) {
keyUsageFlag |= KeyUsage.keyEncipherment | KeyUsage.dataEncipherment;
}
- if(digitalSignature) {
+ if (digitalSignature) {
keyUsageFlag |= KeyUsage.digitalSignature;
}
@@ -303,7 +303,7 @@ public final class CertificateSignRequest {
List<Extension> extensions = new ArrayList<>();
// Add basic extension
- if(ca) {
+ if (ca) {
extensions.add(getBasicExtension());
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
index 5a9fba6..8aa512f 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
@@ -44,7 +44,7 @@ public class CRLInfo implements Comparator<CRLInfo>,
private Instant revocationTime;
private CRLInfo(X509CRL x509CRL, long creationTimestamp, long crlSequenceID) {
- assert((x509CRL != null) &&
+ assert ((x509CRL != null) &&
!x509CRL.getRevokedCertificates().isEmpty());
this.x509CRL = x509CRL;
this.creationTimestamp = creationTimestamp;
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfoCodec.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfoCodec.java
index 3178cfd..2d53b8f 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfoCodec.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfoCodec.java
@@ -44,7 +44,7 @@ public class CRLInfoCodec implements Codec<CRLInfo> {
try {
return CRLInfo.fromProtobuf(
HddsProtos.CRLInfoProto.PARSER.parseFrom(rawData));
- } catch (CertificateException|CRLException e) {
+ } catch (CertificateException | CRLException e) {
throw new IllegalArgumentException(
"Can't encode the the raw data from the byte array", e);
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
index a3f1b6b..f4f188a 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
@@ -192,7 +192,7 @@ public class ProfileServlet extends HttpServlet {
protected static String generateFileName(Integer pid, Output output,
Event event) {
String outputFormat = output.name().toLowerCase();
- if(output == Output.FLAMEGRAPH) {
+ if (output == Output.FLAMEGRAPH) {
outputFormat = "html";
}
return FILE_PREFIX + pid + "-" +
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/DBCheckpointMetrics.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/DBCheckpointMetrics.java
index 87dc882..3dc1766 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/DBCheckpointMetrics.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/DBCheckpointMetrics.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
* This interface is for maintaining DB checkpoint statistics.
*/
@InterfaceAudience.Private
-@Metrics(about="DB checkpoint Metrics", context="dfs")
+@Metrics(about = "DB checkpoint Metrics", context = "dfs")
public class DBCheckpointMetrics {
private static final String SOURCE_NAME =
DBCheckpointMetrics.class.getSimpleName();
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
index 78f8a80..7f2deeb 100644
--- 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
@@ -404,7 +404,7 @@ public final class HAUtils {
return getCAListWithRetry(() -> waitForCACerts(
scmSecurityProtocolClient::listCACertificate,
expectedCount), waitDuration);
- } else{
+ } else {
return scmSecurityProtocolClient.listCACertificate();
}
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/MetadataKeyFilters.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/MetadataKeyFilters.java
index 508320e..e3b91ba 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/MetadataKeyFilters.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/MetadataKeyFilters.java
@@ -82,7 +82,7 @@ public final class MetadataKeyFilters {
private int keysScanned = 0;
private int keysHinted = 0;
- public KeyPrefixFilter() {}
+ public KeyPrefixFilter() { }
/**
* KeyPrefixFilter constructor. It is made of positive and negative prefix
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/TransactionInfo.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/TransactionInfo.java
index ec4c0e1..1d1bff1 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/TransactionInfo.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/TransactionInfo.java
@@ -47,7 +47,7 @@ public final class TransactionInfo {
private TransactionInfo(String transactionInfo) {
String[] tInfo =
transactionInfo.split(TRANSACTION_INFO_SPLIT_KEY);
- Preconditions.checkState(tInfo.length==2,
+ Preconditions.checkState(tInfo.length == 2,
"Incorrect TransactionInfo value");
term = Long.parseLong(tInfo[0]);
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBConfigFromFile.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBConfigFromFile.java
index 50ac54f..c9bf385 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBConfigFromFile.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBConfigFromFile.java
@@ -124,8 +124,8 @@ public final class DBConfigFromFile {
Env env = Env.getDefault();
DBOptions options = null;
File configLocation = getConfigLocation();
- if(configLocation != null &&
- StringUtil.isNotBlank(configLocation.toString())){
+ if (configLocation != null &&
+ StringUtil.isNotBlank(configLocation.toString())) {
Path optionsFile = Paths.get(configLocation.toString(),
getOptionsFileNameFromDB(dbFileName));
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
index ad48a19..8b07003 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
@@ -168,7 +168,7 @@ public final class DBStoreBuilder {
* @return DBStore
*/
public DBStore build() throws IOException {
- if(StringUtil.isBlank(dbname) || (dbPath == null)) {
+ if (StringUtil.isBlank(dbname) || (dbPath == null)) {
LOG.error("Required Parameter missing.");
throw new IOException("Required parameter is missing. Please make sure "
+ "Path and DB name is provided.");
@@ -340,7 +340,7 @@ public final class DBStoreBuilder {
try {
option = DBConfigFromFile.readFromFile(dbname,
columnFamilyDescriptors);
- if(option != null) {
+ if (option != null) {
LOG.info("Using RocksDB DBOptions from {}.ini file", dbname);
}
} catch (IOException ex) {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TypedTable.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TypedTable.java
index f92306a..c7f6196 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TypedTable.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TypedTable.java
@@ -98,7 +98,7 @@ public class TypedTable<KEY, VALUE> implements Table<KEY, VALUE> {
if (cacheType == CacheType.FULL_CACHE) {
cache = new FullTableCache<>();
//fill cache
- try(TableIterator<KEY, ? extends KeyValue<KEY, VALUE>> tableIterator =
+ try (TableIterator<KEY, ? extends KeyValue<KEY, VALUE>> tableIterator =
iterator()) {
while (tableIterator.hasNext()) {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/CacheKey.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/CacheKey.java
index 7be2921..401d644 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/CacheKey.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/CacheKey.java
@@ -56,7 +56,7 @@ public class CacheKey<KEY> implements Comparable<KEY> {
@Override
public int compareTo(Object o) {
- if(Objects.equals(key, ((CacheKey<?>)o).key)) {
+ if (Objects.equals(key, ((CacheKey<?>)o).key)) {
return 0;
} else {
return key.toString().compareTo((((CacheKey<?>) o).key).toString());
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/EpochEntry.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/EpochEntry.java
index d87e90d..120a08b 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/EpochEntry.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/EpochEntry.java
@@ -63,7 +63,7 @@ public class EpochEntry<CACHEKEY> implements Comparable<CACHEKEY> {
@Override
public int compareTo(Object o) {
- if(this.epoch == ((EpochEntry<?>)o).epoch) {
+ if (this.epoch == ((EpochEntry<?>)o).epoch) {
return 0;
} else if (this.epoch < ((EpochEntry<?>)o).epoch) {
return -1;
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/MockCAStore.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/MockCAStore.java
index 39bf082..a2b2e77 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/MockCAStore.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/MockCAStore.java
@@ -92,7 +92,7 @@ public class MockCAStore implements CertificateStore {
}
@Override
- public void reinitialize(SCMMetadataStore metadataStore) {}
+ public void reinitialize(SCMMetadataStore metadataStore) { }
@Override
public List<CRLInfo> getCrls(List<Long> crlIds) throws IOException {
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/utils/TestCRLCodec.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/utils/TestCRLCodec.java
index 3d32a33..d6df77f 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/utils/TestCRLCodec.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/utils/TestCRLCodec.java
@@ -138,7 +138,7 @@ public class TestCRLCodec {
assertTrue(crlFile.exists());
try (BufferedReader reader = new BufferedReader(new InputStreamReader(
- new FileInputStream(crlFile), UTF_8))){
+ new FileInputStream(crlFile), UTF_8))) {
// Verify contents of the file
String header = reader.readLine();
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestCertificateSignRequest.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestCertificateSignRequest.java
index 5b1a1f0..1aab7a5 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestCertificateSignRequest.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestCertificateSignRequest.java
@@ -279,8 +279,8 @@ public class TestCertificateSignRequest {
GeneralNames.fromExtensions(
extensions, Extension.subjectAlternativeName);
GeneralName[] names = gns.getNames();
- for(int i=0; i < names.length; i++) {
- if(names[i].getTagNo() == GeneralName.otherName) {
+ for (int i = 0; i < names.length; i++) {
+ if (names[i].getTagNo() == GeneralName.otherName) {
ASN1Encodable asn1Encodable = names[i].getName();
Iterator iterator = ((DLSequence) asn1Encodable).iterator();
while (iterator.hasNext()) {
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestRootCertificate.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestRootCertificate.java
index 1e3a8f4..776aa4a 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestRootCertificate.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestRootCertificate.java
@@ -165,7 +165,7 @@ public class TestRootCertificate {
OzoneSecurityUtil.getValidInetsForCurrentHost().forEach(
ip -> {
builder.addIpAddress(ip.getHostAddress());
- if(validator.isValid(ip.getCanonicalHostName())) {
+ if (validator.isValid(ip.getCanonicalHostName())) {
builder.addDnsName(ip.getCanonicalHostName());
}
});
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/keys/TestHDDSKeyGenerator.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/keys/TestHDDSKeyGenerator.java
index 9bad0f31..2fef2b8 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/keys/TestHDDSKeyGenerator.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/keys/TestHDDSKeyGenerator.java
@@ -79,7 +79,7 @@ public class TestHDDSKeyGenerator {
HDDSKeyGenerator keyGen = new HDDSKeyGenerator(config.getConfiguration());
KeyPair keyPair = keyGen.generateKey(4096);
PublicKey publicKey = keyPair.getPublic();
- if(publicKey instanceof RSAPublicKey) {
+ if (publicKey instanceof RSAPublicKey) {
Assert.assertEquals(4096,
((RSAPublicKey)(publicKey)).getModulus().bitLength());
}
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestDBStoreBuilder.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestDBStoreBuilder.java
index 99fcbae..e78bcb0 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestDBStoreBuilder.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestDBStoreBuilder.java
@@ -69,7 +69,7 @@ public class TestDBStoreBuilder {
public void builderWithOneParamV2() throws IOException {
OzoneConfiguration conf = new OzoneConfiguration();
File newFolder = folder.newFolder();
- if(!newFolder.exists()) {
+ if (!newFolder.exists()) {
Assert.assertTrue(newFolder.mkdirs());
}
thrown.expect(IOException.class);
@@ -82,7 +82,7 @@ public class TestDBStoreBuilder {
public void builderWithOpenClose() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
File newFolder = folder.newFolder();
- if(!newFolder.exists()) {
+ if (!newFolder.exists()) {
Assert.assertTrue(newFolder.mkdirs());
}
DBStore dbStore = DBStoreBuilder.newBuilder(conf)
@@ -97,7 +97,7 @@ public class TestDBStoreBuilder {
public void builderWithDoubleTableName() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
File newFolder = folder.newFolder();
- if(!newFolder.exists()) {
+ if (!newFolder.exists()) {
Assert.assertTrue(newFolder.mkdirs());
}
// Registering a new table with the same name should replace the previous
@@ -127,7 +127,7 @@ public class TestDBStoreBuilder {
public void builderWithDataWrites() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
File newFolder = folder.newFolder();
- if(!newFolder.exists()) {
+ if (!newFolder.exists()) {
Assert.assertTrue(newFolder.mkdirs());
}
try (DBStore dbStore = DBStoreBuilder.newBuilder(conf)
@@ -156,7 +156,7 @@ public class TestDBStoreBuilder {
public void builderWithDiskProfileWrites() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
File newFolder = folder.newFolder();
- if(!newFolder.exists()) {
+ if (!newFolder.exists()) {
Assert.assertTrue(newFolder.mkdirs());
}
try (DBStore dbStore = DBStoreBuilder.newBuilder(conf)
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBStore.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBStore.java
index c1eafa6..ed8744c 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBStore.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBStore.java
@@ -74,7 +74,7 @@ public class TestRDBStore {
statistics.setStatsLevel(StatsLevel.ALL);
options = options.setStatistics(statistics);
configSet = new HashSet<>();
- for(String name : families) {
+ for (String name : families) {
TableConfig newConfig = new TableConfig(name, new ColumnFamilyOptions());
configSet.add(newConfig);
}
@@ -358,7 +358,7 @@ public class TestRDBStore {
options.setCreateMissingColumnFamilies(true);
configSet = new HashSet<>();
List<String> familiesMinusOne = families.subList(0, families.size() - 1);
- for(String name : familiesMinusOne) {
+ for (String name : familiesMinusOne) {
TableConfig newConfig = new TableConfig(name, new ColumnFamilyOptions());
configSet.add(newConfig);
}
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBStoreIterator.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBStoreIterator.java
index fea40bb..b49556d 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBStoreIterator.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBStoreIterator.java
@@ -92,7 +92,7 @@ public class TestRDBStoreIterator {
}
@Test
- public void testHasNextDependsOnIsvalid(){
+ public void testHasNextDependsOnIsvalid() {
when(rocksDBIteratorMock.isValid()).thenReturn(true, true, false);
RDBStoreIterator iter = new RDBStoreIterator(rocksDBIteratorMock);
@@ -169,7 +169,7 @@ public class TestRDBStoreIterator {
RDBStoreIterator iter = new RDBStoreIterator(rocksDBIteratorMock);
byte[] key = null;
- if(iter.hasNext()) {
+ if (iter.hasNext()) {
ByteArrayKeyValue entry = iter.next();
key = entry.getKey();
}
@@ -191,7 +191,7 @@ public class TestRDBStoreIterator {
ByteArrayKeyValue entry;
byte[] key = null;
byte[] value = null;
- if(iter.hasNext()) {
+ if (iter.hasNext()) {
entry = iter.next();
key = entry.getKey();
value = entry.getValue();
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBTableStore.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBTableStore.java
index 5d00763..0f1858b 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBTableStore.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestRDBTableStore.java
@@ -63,7 +63,7 @@ public class TestRDBTableStore {
count++;
try {
Assert.assertNotNull(keyValue.getKey());
- } catch(IOException ex) {
+ } catch (IOException ex) {
Assert.fail("Unexpected Exception " + ex.toString());
}
return true;
@@ -80,7 +80,7 @@ public class TestRDBTableStore {
options = options.setStatistics(statistics);
Set<TableConfig> configSet = new HashSet<>();
- for(String name : families) {
+ for (String name : families) {
TableConfig newConfig = new TableConfig(name, new ColumnFamilyOptions());
configSet.add(newConfig);
}
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestTypedRDBTableStore.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestTypedRDBTableStore.java
index 073027f..837ea27 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestTypedRDBTableStore.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestTypedRDBTableStore.java
@@ -296,7 +296,7 @@ public class TestTypedRDBTableStore {
}
ArrayList<Long> epochs = new ArrayList<>();
- for (long i=0; i<=5L; i++) {
+ for (long i = 0; i <= 5L; i++) {
epochs.add(i);
}
testTable.cleanupCache(epochs);
diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/cache/TestTableCache.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/cache/TestTableCache.java
index a1cc7dd..860a695 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/cache/TestTableCache.java
+++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/cache/TestTableCache.java
@@ -74,13 +74,13 @@ public class TestTableCache {
public void testPartialTableCache() {
- for (int i = 0; i< 10; i++) {
+ for (int i = 0; i < 10; i++) {
tableCache.put(new CacheKey<>(Integer.toString(i)),
new CacheValue<>(Optional.of(Integer.toString(i)), i));
}
- for (int i=0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
Assert.assertEquals(Integer.toString(i),
tableCache.get(new CacheKey<>(Integer.toString(i))).getCacheValue());
}
@@ -94,7 +94,7 @@ public class TestTableCache {
// On a full table cache if some one calls cleanup it is a no-op.
tableCache.evictCache(epochs);
- for (int i=5; i < 10; i++) {
+ for (int i = 5; i < 10; i++) {
Assert.assertEquals(Integer.toString(i),
tableCache.get(new CacheKey<>(Integer.toString(i))).getCacheValue());
}
@@ -109,7 +109,7 @@ public class TestTableCache {
int cleanupCount = 0;
ArrayList<Long> epochs = new ArrayList();
- for (long i=0; i<insertedCount; i+=2) {
+ for (long i = 0; i < insertedCount; i += 2) {
if (cleanupCount++ < 1000) {
epochs.add(i);
}
@@ -329,7 +329,7 @@ public class TestTableCache {
});
// Check we have first 10 entries in cache.
- for (int i=1; i <= 10; i++) {
+ for (int i = 1; i <= 10; i++) {
Assert.assertEquals(Integer.toString(i),
tableCache.get(new CacheKey<>(Integer.toString(i))).getCacheValue());
}
@@ -357,13 +357,13 @@ public class TestTableCache {
final int tc = totalCount;
Assert.assertEquals(tc - deleted, tableCache.size());
// Check if we have remaining entries.
- for (int i=6; i <= totalCount; i++) {
+ for (int i = 6; i <= totalCount; i++) {
Assert.assertEquals(Integer.toString(i), tableCache.get(
new CacheKey<>(Integer.toString(i))).getCacheValue());
}
epochs = new ArrayList<>();
- for (long i=6; i<= totalCount; i++) {
+ for (long i = 6; i <= totalCount; i++) {
epochs.add(i);
}
@@ -373,7 +373,7 @@ public class TestTableCache {
Assert.assertEquals(0, tableCache.size());
} else {
ArrayList<Long> epochs = new ArrayList<>();
- for (long i=0; i<= totalCount; i++) {
+ for (long i = 0; i <= totalCount; i++) {
epochs.add(i);
}
tableCache.evictCache(epochs);
@@ -453,7 +453,7 @@ public class TestTableCache {
tableCache.evictCache(epochs);
- if(cacheType == TableCache.CacheType.PARTIAL_CACHE) {
+ if (cacheType == TableCache.CacheType.PARTIAL_CACHE) {
Assert.assertTrue(tableCache.size() == 0);
Assert.assertTrue(tableCache.getEpochEntrySet().size() == 0);
} else {
@@ -475,7 +475,7 @@ public class TestTableCache {
private int writeToCache(int count, int startVal, long sleep)
throws InterruptedException {
int counter = 1;
- while (counter <= count){
+ while (counter <= count) {
tableCache.put(new CacheKey<>(Integer.toString(startVal)),
new CacheValue<>(Optional.of(Integer.toString(startVal)), startVal));
startVal++;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java
index 3c5fdc0..78a87b8 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java
@@ -442,7 +442,7 @@ public class DeletedBlockLogImpl
commitTransactions(ackProto.getResultsList(),
UUID.fromString(ackProto.getDnId()));
metrics.incrBlockDeletionCommandSuccess();
- } else if (status == CommandStatus.Status.FAILED){
+ } else if (status == CommandStatus.Status.FAILED) {
metrics.incrBlockDeletionCommandFailure();
} else {
LOG.error("Delete Block Command is not executed yet.");
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReplicaCount.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReplicaCount.java
index 590d1f1..3dab4ad 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReplicaCount.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReplicaCount.java
@@ -100,15 +100,15 @@ public class ContainerReplicaCount {
@Override
public String toString() {
- return "Container State: " +container.getState()+
- " Replica Count: "+replica.size()+
- " Healthy Count: "+healthyCount+
- " Decommission Count: "+decommissionCount+
- " Maintenance Count: "+maintenanceCount+
- " inFlightAdd Count: "+inFlightAdd+
- " inFightDel Count: "+inFlightDel+
- " ReplicationFactor: "+repFactor+
- " minMaintenance Count: "+minHealthyForMaintenance;
+ return "Container State: " + container.getState() +
+ " Replica Count: " + replica.size() +
+ " Healthy Count: " + healthyCount +
+ " Decommission Count: " + decommissionCount +
+ " Maintenance Count: " + maintenanceCount +
+ " inFlightAdd Count: " + inFlightAdd +
+ " inFightDel Count: " + inFlightDel +
+ " ReplicationFactor: " + repFactor +
+ " minMaintenance Count: " + minHealthyForMaintenance;
}
/**
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReportHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReportHandler.java
index 32804d7..8a50884 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReportHandler.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerReportHandler.java
@@ -164,7 +164,7 @@ public class ContainerReportHandler extends AbstractContainerReportHandler
try {
processContainerReplica(datanodeDetails, replicaProto, publisher);
} catch (ContainerNotFoundException e) {
- if(unknownContainerHandleAction.equals(
+ if (unknownContainerHandleAction.equals(
UNKNOWN_CONTAINER_ACTION_WARN)) {
LOG.error("Received container report for an unknown container" +
" {} from datanode {}.", replicaProto.getContainerID(),
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManager.java
index 7f52a06..59e73a3 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManager.java
@@ -487,7 +487,7 @@ public class ReplicationManager implements SCMService {
updateInflightAction(container, inflightReplication,
action -> replicas.stream()
.anyMatch(r -> r.getDatanodeDetails().equals(action.datanode)),
- ()-> metrics.incrNumReplicationCmdsTimeout(),
+ () -> metrics.incrNumReplicationCmdsTimeout(),
action -> updateCompletedReplicationMetrics(container, action));
updateInflightAction(container, inflightDeletion,
@@ -624,7 +624,7 @@ public class ReplicationManager implements SCMService {
final List<InflightAction> actions = inflightActions.get(id);
Iterator<InflightAction> iter = actions.iterator();
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
try {
InflightAction a = iter.next();
NodeStatus status = nodeManager.getNodeStatus(a.datanode);
@@ -919,7 +919,7 @@ public class ReplicationManager implements SCMService {
*/
private boolean isPolicySatisfiedAfterMove(ContainerInfo cif,
DatanodeDetails srcDn, DatanodeDetails targetDn,
- final List<ContainerReplica> replicas){
+ final List<ContainerReplica> replicas) {
Set<ContainerReplica> movedReplicas =
replicas.stream().collect(Collectors.toSet());
movedReplicas.removeIf(r -> r.getDatanodeDetails().equals(srcDn));
@@ -1157,7 +1157,7 @@ public class ReplicationManager implements SCMService {
if (replicaSet.isSufficientlyReplicated()
&& placementStatus.isPolicySatisfied()) {
- LOG.info("The container {} with replicas {} is sufficiently "+
+ LOG.info("The container {} with replicas {} is sufficiently " +
"replicated and is not mis-replicated",
container.getContainerID(), replicaSet);
return;
@@ -1348,8 +1348,8 @@ public class ReplicationManager implements SCMService {
ContainerReplicaCount replicaCount =
getContainerReplicaCount(cif, replicaSet);
- if(!replicaSet.stream()
- .anyMatch(r -> r.getDatanodeDetails().equals(srcDn))){
+ if (!replicaSet.stream()
+ .anyMatch(r -> r.getDatanodeDetails().equals(srcDn))) {
// if the target is present but source disappears somehow,
// we can consider move is successful.
compleleteMoveFutureWithResult(cid, MoveResult.COMPLETED);
@@ -1654,7 +1654,7 @@ public class ReplicationManager implements SCMService {
try {
return nodeManager.getNodeStatus(dn);
} catch (NodeNotFoundException e) {
- throw new IllegalStateException("Unable to find NodeStatus for "+dn, e);
+ throw new IllegalStateException("Unable to find NodeStatus for " + dn, e);
}
}
@@ -1944,7 +1944,7 @@ public class ReplicationManager implements SCMService {
try {
cid = ContainerID.getFromProtobuf(contianerIDProto);
mp = MoveDataNodePair.getFromProtobuf(mdnpp);
- if(!inflightMove.containsKey(cid)) {
+ if (!inflightMove.containsKey(cid)) {
transactionBuffer.addToBuffer(moveTable, cid, mp);
inflightMove.putIfAbsent(cid, mp);
}
@@ -2055,8 +2055,8 @@ public class ReplicationManager implements SCMService {
boolean isTgtExist = replicas.stream()
.anyMatch(r -> r.getDatanodeDetails().equals(v.getTgt()));
- if(isSrcExist) {
- if(isTgtExist) {
+ if (isSrcExist) {
+ if (isTgtExist) {
//the former scm leader may or may not send the deletion command
//before reelection.here, we just try to send the command again.
deleteSrcDnForMove(cif, replicas);
@@ -2081,8 +2081,8 @@ public class ReplicationManager implements SCMService {
* complete the CompletableFuture of the container in the given Map with
* a given MoveResult.
*/
- private void compleleteMoveFutureWithResult(ContainerID cid, MoveResult mr){
- if(inflightMoveFuture.containsKey(cid)) {
+ private void compleleteMoveFutureWithResult(ContainerID cid, MoveResult mr) {
+ if (inflightMoveFuture.containsKey(cid)) {
inflightMoveFuture.get(cid).complete(mr);
inflightMoveFuture.remove(cid);
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/AbstractFindTargetGreedy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/AbstractFindTargetGreedy.java
index a975f04..018f0df 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/AbstractFindTargetGreedy.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/AbstractFindTargetGreedy.java
@@ -70,7 +70,7 @@ public abstract class AbstractFindTargetGreedy implements FindTargetStrategy {
potentialTargets = pt;
}
- private void setUpperLimit(Double upperLimit){
+ private void setUpperLimit(Double upperLimit) {
this.upperLimit = upperLimit;
}
@@ -199,12 +199,12 @@ public abstract class AbstractFindTargetGreedy implements FindTargetStrategy {
*/
@Override
public void increaseSizeEntering(DatanodeDetails target, long size) {
- if(sizeEnteringNode.containsKey(target)) {
+ if (sizeEnteringNode.containsKey(target)) {
long totalEnteringSize = sizeEnteringNode.get(target) + size;
sizeEnteringNode.put(target, totalEnteringSize);
potentialTargets.removeIf(
c -> c.getDatanodeDetails().equals(target));
- if(totalEnteringSize < config.getMaxSizeEnteringTarget()) {
+ if (totalEnteringSize < config.getMaxSizeEnteringTarget()) {
//reorder
potentialTargets.add(nodeManager.getUsageInfo(target));
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
index ea32cfa..995a5da 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancer.java
@@ -180,7 +180,7 @@ public class ContainerBalancer {
*/
private void balance() {
this.iterations = config.getIterations();
- if(this.iterations == -1) {
+ if (this.iterations == -1) {
//run balancer infinitely
this.iterations = Integer.MAX_VALUE;
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
index 8582347..11a8a98 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerConfiguration.java
@@ -361,8 +361,8 @@ public final class ContainerBalancerConfiguration {
"%-50s %s%n" +
"%-50s %s%n" +
"%-50s %d%n" +
- "%-50s %dGB%n"+
- "%-50s %dGB%n"+
+ "%-50s %dGB%n" +
+ "%-50s %dGB%n" +
"%-50s %dGB%n", "Key", "Value", "Threshold",
threshold, "Max Datanodes to Involve per Iteration(percent)",
maxDatanodesPercentageToInvolvePerIteration,
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindSourceGreedy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindSourceGreedy.java
index 591461d..540d263 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindSourceGreedy.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindSourceGreedy.java
@@ -33,7 +33,7 @@ import java.util.UUID;
* The selection criteria for selecting source datanodes , the containers of
* which will be moved out.
*/
-public class FindSourceGreedy implements FindSourceStrategy{
+public class FindSourceGreedy implements FindSourceStrategy {
private static final Logger LOG =
LoggerFactory.getLogger(FindSourceGreedy.class);
private Map<DatanodeDetails, Long> sizeLeavingNode;
@@ -84,7 +84,7 @@ public class FindSourceGreedy implements FindSourceStrategy{
@Override
public void increaseSizeLeaving(DatanodeDetails dui, long size) {
Long currentSize = sizeLeavingNode.get(dui);
- if(currentSize != null) {
+ if (currentSize != null) {
sizeLeavingNode.put(dui, currentSize + size);
//reorder according to the latest sizeLeavingNode
potentialSources.add(nodeManager.getUsageInfo(dui));
@@ -114,7 +114,7 @@ public class FindSourceGreedy implements FindSourceStrategy{
* data nodes.
*/
@Override
- public void removeCandidateSourceDataNode(DatanodeDetails dui){
+ public void removeCandidateSourceDataNode(DatanodeDetails dui) {
potentialSources.removeIf(a -> a.getDatanodeDetails().equals(dui));
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/ContainerPlacementPolicyFactory.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/ContainerPlacementPolicyFactory.java
index c799b02..bf0ea7c 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/ContainerPlacementPolicyFactory.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/ContainerPlacementPolicyFactory.java
@@ -47,7 +47,7 @@ public final class ContainerPlacementPolicyFactory {
public static PlacementPolicy getPolicy(
ConfigurationSource conf, final NodeManager nodeManager,
NetworkTopology clusterMap, final boolean fallback,
- SCMContainerPlacementMetrics metrics) throws SCMException{
+ SCMContainerPlacementMetrics metrics) throws SCMException {
final Class<? extends PlacementPolicy> placementClass = conf
.getClass(ScmConfigKeys.OZONE_SCM_CONTAINER_PLACEMENT_IMPL_KEY,
OZONE_SCM_CONTAINER_PLACEMENT_IMPL_DEFAULT,
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementMetrics.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementMetrics.java
index 1ca68bd..22bdf21 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementMetrics.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementMetrics.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.ozone.OzoneConsts;
/**
* This class is for maintaining Topology aware container placement statistics.
*/
-@Metrics(about="SCM Container Placement Metrics", context = OzoneConsts.OZONE)
+@Metrics(about = "SCM Container Placement Metrics", context = OzoneConsts.OZONE)
public class SCMContainerPlacementMetrics implements MetricsSource {
public static final String SOURCE_NAME =
SCMContainerPlacementMetrics.class.getSimpleName();
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementRackAware.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementRackAware.java
index d46713b..2631a1d 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementRackAware.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/SCMContainerPlacementRackAware.java
@@ -55,7 +55,7 @@ public final class SCMContainerPlacementRackAware
private final NetworkTopology networkTopology;
private boolean fallback;
private static final int RACK_LEVEL = 1;
- private static final int MAX_RETRY= 3;
+ private static final int MAX_RETRY = 3;
private final SCMContainerPlacementMetrics metrics;
// Used to check the placement policy is validated in the parent class
private static final int REQUIRED_RACKS = 2;
@@ -118,7 +118,7 @@ public final class SCMContainerPlacementRackAware
mutableFavoredNodes.addAll(favoredNodes);
mutableFavoredNodes.removeAll(excludedNodes);
}
- int favoredNodeNum = mutableFavoredNodes == null? 0 :
+ int favoredNodeNum = mutableFavoredNodes == null ? 0 :
mutableFavoredNodes.size();
List<DatanodeDetails> chosenNodes = new ArrayList<>();
@@ -195,7 +195,7 @@ public final class SCMContainerPlacementRackAware
// in the same rack, then choose nodes on different racks, otherwise,
// choose one on the same rack as one of excluded nodes, remaining chosen
// are on different racks.
- for(int i = 0; i < excludedNodesCount; i++) {
+ for (int i = 0; i < excludedNodesCount; i++) {
for (int j = i + 1; j < excludedNodesCount; j++) {
if (networkTopology.isSameParent(
excludedNodes.get(i), excludedNodes.get(j))) {
@@ -257,7 +257,7 @@ public final class SCMContainerPlacementRackAware
int maxRetry = MAX_RETRY;
List<String> excludedNodesForCapacity = null;
boolean isFallbacked = false;
- while(true) {
+ while (true) {
metrics.incrDatanodeChooseAttemptCount();
DatanodeDetails node = null;
if (affinityNodes != null) {
@@ -348,8 +348,8 @@ public final class SCMContainerPlacementRackAware
Preconditions.checkArgument(chosenNodes != null);
List<DatanodeDetails> excludedNodeList = excludedNodes != null ?
excludedNodes : chosenNodes;
- int favoredNodeNum = favoredNodes == null? 0 : favoredNodes.size();
- while(true) {
+ int favoredNodeNum = favoredNodes == null ? 0 : favoredNodes.size();
+ while (true) {
DatanodeDetails favoredNode = favoredNodeNum > favorIndex ?
favoredNodes.get(favorIndex) : null;
DatanodeDetails chosenNode;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMMetrics.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMMetrics.java
index 5194829..f9d2ade 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMMetrics.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMMetrics.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
/**
* This class is for maintaining StorageContainerManager statistics.
*/
-@Metrics(about="Storage Container Manager Metrics", context="dfs")
+@Metrics(about = "Storage Container Manager Metrics", context = "dfs")
public class SCMMetrics {
public static final String SOURCE_NAME =
SCMMetrics.class.getSimpleName();
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerStateMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerStateMap.java
index bbf1c70..c254dd7 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerStateMap.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerStateMap.java
@@ -358,7 +358,7 @@ public class ContainerStateMap {
final ContainerQueryKey queryKey =
new ContainerQueryKey(state, owner, repConfig);
- if(resultCache.containsKey(queryKey)){
+ if (resultCache.containsKey(queryKey)) {
return resultCache.get(queryKey);
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
index 5023e93..edea681 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
@@ -216,7 +216,7 @@ public final class HASecurityUtils {
// Persist scm cert serial ID.
scmStorageConfig.setScmCertSerialId(subSCMCertHolder.getSerialNumber()
.toString());
- } catch (InterruptedException | ExecutionException| IOException |
+ } catch (InterruptedException | ExecutionException | IOException |
CertificateException e) {
LOG.error("Error while fetching/storing SCM signed certificate.", e);
Thread.currentThread().interrupt();
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java
index e949850..4154b62 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java
@@ -133,7 +133,7 @@ public final class RatisUtil {
ScmConfigKeys.OZONE_SCM_HA_RATIS_LEADER_ELECTION_TIMEOUT,
ScmConfigKeys.
OZONE_SCM_HA_RATIS_LEADER_ELECTION_TIMEOUT_DEFAULT,
- TimeUnit.MILLISECONDS)+200L,
+ TimeUnit.MILLISECONDS) + 200L,
TimeUnit.MILLISECONDS));
Rpc.setSlownessTimeout(properties, TimeDuration.valueOf(
ozoneConf.getTimeDuration(
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAInvocationHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAInvocationHandler.java
index 8e10968..bb12df6 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAInvocationHandler.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAInvocationHandler.java
@@ -68,7 +68,7 @@ public class SCMHAInvocationHandler implements InvocationHandler {
invokeLocal(method, args);
LOG.debug("Call: {} took {} ms", method, Time.monotonicNow() - startTime);
return result;
- } catch(InvocationTargetException iEx) {
+ } catch (InvocationTargetException iEx) {
throw iEx.getCause();
}
}
@@ -100,7 +100,7 @@ public class SCMHAInvocationHandler implements InvocationHandler {
// via ratis. So, in this special scenario we use RaftClient.
final SCMRatisResponse response;
if (method.getName().equals("storeValidCertificate") &&
- args[args.length -1].equals(HddsProtos.NodeType.SCM)) {
+ args[args.length - 1].equals(HddsProtos.NodeType.SCM)) {
response =
HASecurityUtils.submitScmCertsToRatis(
ratisHandler.getDivision().getGroup(),
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/CodecFactory.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/CodecFactory.java
index 95d906e..9fb771b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/CodecFactory.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/CodecFactory.java
@@ -47,7 +47,7 @@ public final class CodecFactory {
codecs.put(X509Certificate.class, new X509CertificateCodec());
}
- private CodecFactory() {}
+ private CodecFactory() { }
public static Codec getCodec(Class<?> type)
throws InvalidProtocolBufferException {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreImpl.java
index 799e128..de7fcb0 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreImpl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreImpl.java
@@ -238,11 +238,11 @@ public class SCMMetadataStoreImpl implements SCMMetadataStore {
@Override
public TableIterator getAllCerts(CertificateStore.CertType certType) {
- if(certType == CertificateStore.CertType.VALID_CERTS) {
+ if (certType == CertificateStore.CertType.VALID_CERTS) {
return validCertsTable.iterator();
}
- if(certType == CertificateStore.CertType.REVOKED_CERTS) {
+ if (certType == CertificateStore.CertType.REVOKED_CERTS) {
return revokedCertsTable.iterator();
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/X509CertificateCodec.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/X509CertificateCodec.java
index 9bfa7d6..bf2559b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/X509CertificateCodec.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/X509CertificateCodec.java
@@ -44,7 +44,7 @@ public class X509CertificateCodec implements Codec<X509Certificate> {
@Override
public X509Certificate fromPersistedFormat(byte[] rawData)
throws IOException {
- try{
+ try {
String s = new String(rawData, StandardCharsets.UTF_8);
return CertificateCodec.getX509Certificate(s);
} catch (CertificateException exp) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/CommandQueue.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/CommandQueue.java
index eb6dc0d..aa93025 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/CommandQueue.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/CommandQueue.java
@@ -91,7 +91,7 @@ public class CommandQueue {
try {
Commands cmds = commandMap.remove(datanodeUuid);
List<SCMCommand> cmdList = null;
- if(cmds != null) {
+ if (cmds != null) {
cmdList = cmds.getCommands();
commandsInQueue -= cmdList.size() > 0 ? cmdList.size() : 0;
// A post condition really.
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java
index 27a84de..47d7c53 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java
@@ -85,20 +85,20 @@ public class NodeDecommissionManager {
return port;
}
- private void parseHostname() throws InvalidHostStringException{
+ private void parseHostname() throws InvalidHostStringException {
try {
// A URI *must* have a scheme, so just create a fake one
- URI uri = new URI("empty://"+rawHostname.trim());
+ URI uri = new URI("empty://" + rawHostname.trim());
this.hostname = uri.getHost();
this.port = uri.getPort();
if (this.hostname == null) {
- throw new InvalidHostStringException("The string "+rawHostname+
+ throw new InvalidHostStringException("The string " + rawHostname +
" does not contain a value hostname or hostname:port definition");
}
} catch (URISyntaxException e) {
throw new InvalidHostStringException(
- "Unable to parse the hoststring "+rawHostname, e);
+ "Unable to parse the hoststring " + rawHostname, e);
}
}
}
@@ -138,7 +138,7 @@ public class NodeDecommissionManager {
results.add(found.get(0));
} else if (found.size() > 1) {
DatanodeDetails match = null;
- for(DatanodeDetails dn : found) {
+ for (DatanodeDetails dn : found) {
if (validateDNPortMatch(host.getPort(), dn)) {
match = dn;
break;
@@ -231,7 +231,7 @@ public class NodeDecommissionManager {
// NodeNotFoundException here expect if the node is remove in the
// very short window between validation and starting decom. Therefore
// log a warning and ignore the exception
- LOG.warn("The host {} was not found in SCM. Ignoring the request to "+
+ LOG.warn("The host {} was not found in SCM. Ignoring the request to " +
"decommission it", dn.getHostName());
errors.add(new DatanodeAdminError(dn.getHostName(),
"The host was not found in SCM"));
@@ -274,12 +274,12 @@ public class NodeDecommissionManager {
dn, NodeOperationalState.DECOMMISSIONING);
monitor.startMonitoring(dn);
} else if (nodeStatus.isDecommission()) {
- LOG.info("Start Decommission called on node {} in state {}. Nothing to "+
+ LOG.info("Start Decommission called on node {} in state {}. Nothing to " +
"do.", dn, opState);
} else {
LOG.error("Cannot decommission node {} in state {}", dn, opState);
- throw new InvalidNodeStateException("Cannot decommission node "+
- dn +" in state "+ opState);
+ throw new InvalidNodeStateException("Cannot decommission node " +
+ dn + " in state " + opState);
}
}
@@ -296,7 +296,7 @@ public class NodeDecommissionManager {
// NodeNotFoundException here expect if the node is remove in the
// very short window between validation and starting decom. Therefore
// log a warning and ignore the exception
- LOG.warn("Host {} was not found in SCM. Ignoring the request to "+
+ LOG.warn("Host {} was not found in SCM. Ignoring the request to " +
"recommission it.", dn.getHostName());
errors.add(new DatanodeAdminError(dn.getHostName(),
"The host was not found in SCM"));
@@ -306,7 +306,7 @@ public class NodeDecommissionManager {
}
public synchronized void recommission(DatanodeDetails dn)
- throws NodeNotFoundException{
+ throws NodeNotFoundException {
NodeStatus nodeStatus = getNodeStatus(dn);
NodeOperationalState opState = nodeStatus.getOperationalState();
if (opState != NodeOperationalState.IN_SERVICE) {
@@ -315,7 +315,7 @@ public class NodeDecommissionManager {
monitor.stopMonitoring(dn);
LOG.info("Queued node {} for recommission", dn);
} else {
- LOG.info("Recommission called on node {} with state {}. "+
+ LOG.info("Recommission called on node {} with state {}. " +
"Nothing to do.", dn, opState);
}
}
@@ -333,7 +333,7 @@ public class NodeDecommissionManager {
// NodeNotFoundException here expect if the node is remove in the
// very short window between validation and starting decom. Therefore
// log a warning and ignore the exception
- LOG.warn("The host {} was not found in SCM. Ignoring the request to "+
+ LOG.warn("The host {} was not found in SCM. Ignoring the request to " +
"start maintenance on it", dn.getHostName());
} catch (InvalidNodeStateException e) {
errors.add(new DatanodeAdminError(dn.getHostName(), e.getMessage()));
@@ -360,12 +360,12 @@ public class NodeDecommissionManager {
monitor.startMonitoring(dn);
LOG.info("Starting Maintenance for node {}", dn);
} else if (nodeStatus.isMaintenance()) {
- LOG.info("Starting Maintenance called on node {} with state {}. "+
+ LOG.info("Starting Maintenance called on node {} with state {}. " +
"Nothing to do.", dn, opState);
} else {
LOG.error("Cannot start maintenance on node {} in state {}", dn, opState);
- throw new InvalidNodeStateException("Cannot start maintenance on node "+
- dn +" in state "+ opState);
+ throw new InvalidNodeStateException("Cannot start maintenance on node " +
+ dn + " in state " + opState);
}
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
index 4e1a964..6127bb0 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
@@ -324,7 +324,7 @@ public interface NodeManager extends StorageContainerNodeProtocol,
return null;
}
- default HDDSLayoutVersionManager getLayoutVersionManager(){
+ default HDDSLayoutVersionManager getLayoutVersionManager() {
return null;
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
index e752454..85dd6a0 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
@@ -728,7 +728,7 @@ public class NodeStateManager implements Runnable, Closeable {
(lastHbTime) -> lastHbTime < staleNodeDeadline;
try {
- for(DatanodeInfo node : nodeStateMap.getAllDatanodeInfos()) {
+ for (DatanodeInfo node : nodeStateMap.getAllDatanodeInfos()) {
NodeStatus status = nodeStateMap.getNodeStatus(node.getUuid());
switch (status.getHealth()) {
case HEALTHY:
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStatus.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStatus.java
index a9164c7..03dd2e2 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStatus.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStatus.java
@@ -209,8 +209,8 @@ public class NodeStatus {
@Override
public String toString() {
- return "OperationalState: "+operationalState+" Health: "+health+
- " OperationStateExpiry: "+opStateExpiryEpochSeconds;
+ return "OperationalState: " + operationalState + " Health: " + health +
+ " OperationStateExpiry: " + opStateExpiryEpochSeconds;
}
}
\ No newline at end of file
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index 68c2697..8899b13 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -268,7 +268,7 @@ public class SCMNodeManager implements NodeManager {
*/
@Override
public void setNodeOperationalState(DatanodeDetails datanodeDetails,
- NodeOperationalState newState) throws NodeNotFoundException{
+ NodeOperationalState newState) throws NodeNotFoundException {
setNodeOperationalState(datanodeDetails, newState, 0);
}
@@ -283,7 +283,7 @@ public class SCMNodeManager implements NodeManager {
@Override
public void setNodeOperationalState(DatanodeDetails datanodeDetails,
NodeOperationalState newState, long opStateExpiryEpocSec)
- throws NodeNotFoundException{
+ throws NodeNotFoundException {
nodeStateManager.setNodeOperationalState(
datanodeDetails, newState, opStateExpiryEpocSec);
}
@@ -612,7 +612,7 @@ public class SCMNodeManager implements NodeManager {
// send Finalize command multiple times.
scmNodeEventPublisher.fireEvent(SCMEvents.DATANODE_COMMAND,
new CommandForDatanode<>(datanodeDetails.getUuid(), finalizeCmd));
- } catch(NotLeaderException ex) {
+ } catch (NotLeaderException ex) {
LOG.warn("Skip sending finalize upgrade command since current SCM is" +
"not leader.", ex);
}
@@ -764,7 +764,7 @@ public class SCMNodeManager implements NodeManager {
for (DatanodeInfo dni : nodeStateManager.getAllNodes()) {
NodeStatus status = dni.getNodeStatus();
nodes.get(status.getOperationalState().name())
- .compute(status.getHealth().name(), (k, v) -> v+1);
+ .compute(status.getHealth().name(), (k, v) -> v + 1);
}
return nodes;
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java
index 6eb7359..b727580 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java
@@ -129,12 +129,12 @@ public final class SCMNodeMetrics implements MetricsSource {
* ...
*/
MetricsRecordBuilder metrics = collector.addRecord(registry.info());
- for(Map.Entry<String, Map<String, Integer>> e : nodeCount.entrySet()) {
- for(Map.Entry<String, Integer> h : e.getValue().entrySet()) {
+ for (Map.Entry<String, Map<String, Integer>> e : nodeCount.entrySet()) {
+ for (Map.Entry<String, Integer> h : e.getValue().entrySet()) {
metrics.addGauge(
Interns.info(
- StringUtils.camelize(e.getKey()+"_"+h.getKey()+"_nodes"),
- "Number of "+e.getKey()+" "+h.getKey()+" datanodes"),
+ StringUtils.camelize(e.getKey() + "_" + h.getKey() + "_nodes"),
+ "Number of " + e.getKey() + " " + h.getKey() + " datanodes"),
h.getValue());
}
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeStorageStatMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeStorageStatMap.java
index 1b0e5b5..ed45ed0 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeStorageStatMap.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeStorageStatMap.java
@@ -136,7 +136,7 @@ public class SCMNodeStorageStatMap implements SCMNodeStorageStatMXBean {
//TODO: Unregister call should happen as a part of SCMNodeManager shutdown.
private void unregisterMXBean() {
- if(this.scmNodeStorageInfoBean != null) {
+ if (this.scmNodeStorageInfoBean != null) {
MBeans.unregister(this.scmNodeStorageInfoBean);
this.scmNodeStorageInfoBean = null;
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2ObjectsMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2ObjectsMap.java
index 57a377d..b934d97 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2ObjectsMap.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/Node2ObjectsMap.java
@@ -99,7 +99,7 @@ public class Node2ObjectsMap<T> {
Set<T> getObjects(UUID datanode) {
Preconditions.checkNotNull(datanode);
final Set<T> s = dn2ObjectMap.get(datanode);
- return s != null? Collections.unmodifiableSet(s): Collections.emptySet();
+ return s != null ? Collections.unmodifiableSet(s) : Collections.emptySet();
}
public ReportResult.ReportResultBuilder<T> newBuilder() {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java
index 0a3e137..3146e8f 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/states/NodeStateMap.java
@@ -330,7 +330,7 @@ public class NodeStateMap {
}
public void setContainers(UUID uuid, Set<ContainerID> containers)
- throws NodeNotFoundException{
+ throws NodeNotFoundException {
lock.writeLock().lock();
try {
checkIfNodeExist(uuid);
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
index 9b9e206..954d212 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
@@ -562,7 +562,7 @@ public class PipelineManagerImpl implements PipelineManager {
backgroundPipelineCreator.stop();
}
- if(pmInfoBean != null) {
+ if (pmInfoBean != null) {
MBeans.unregister(this.pmInfoBean);
pmInfoBean = null;
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
index 85ea5a5..64815a9 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
@@ -90,12 +90,12 @@ public class PipelineReportHandler implements
for (PipelineReport report : pipelineReport.getPipelineReportList()) {
try {
processPipelineReport(report, dn, publisher);
- } catch(NotLeaderException ex) {
+ } catch (NotLeaderException ex) {
// Avoid NotLeaderException logging which happens when processing
// pipeline report on followers.
} catch (PipelineNotFoundException e) {
LOGGER.error("Could not find pipeline {}", report.getPipelineID());
- } catch(IOException e) {
+ } catch (IOException e) {
LOGGER.error("Could not process pipeline report={} from dn={}.",
report, dn, e);
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineUtils.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineUtils.java
index 847b50e..bbdabf0 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineUtils.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineUtils.java
@@ -91,7 +91,7 @@ public final class RatisPipelineUtils {
ScmConfigKeys.DFS_CONTAINER_RATIS_RPC_TYPE_DEFAULT);
final RetryPolicy retryPolicy = RatisHelper.createRetryPolicy(ozoneConf);
final RaftPeer p = RatisHelper.toRaftPeer(dn);
- try(RaftClient client = RatisHelper
+ try (RaftClient client = RatisHelper
.newRaftClient(SupportedRpcType.valueOfIgnoreCase(rpcType), p,
retryPolicy, grpcTlsConfig, ozoneConf)) {
client.getGroupManagementApi(p.getId())
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableContainerFactory.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableContainerFactory.java
index 356d047..f130eed 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableContainerFactory.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableContainerFactory.java
@@ -44,7 +44,7 @@ public class WritableContainerFactory {
public ContainerInfo getContainer(final long size,
ReplicationConfig repConfig, String owner, ExcludeList excludeList)
throws IOException {
- switch(repConfig.getReplicationType()) {
+ switch (repConfig.getReplicationType()) {
case STAND_ALONE:
return standaloneProvider
.getContainer(size, repConfig, owner, excludeList);
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
index 0370623..5d6ee5b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
@@ -758,7 +758,7 @@ public final class StorageContainerLocationProtocolServerSideTranslatorPB
Optional<Long> maxSizeEnteringTargetInGB = Optional.empty();
Optional<Long> maxSizeLeavingSourceInGB = Optional.empty();
- if(request.hasThreshold()) {
+ if (request.hasThreshold()) {
threshold = Optional.of(request.getThreshold());
}
@@ -778,15 +778,15 @@ public final class StorageContainerLocationProtocolServerSideTranslatorPB
100));
}
- if(request.hasMaxSizeToMovePerIterationInGB()) {
+ if (request.hasMaxSizeToMovePerIterationInGB()) {
maxSizeToMovePerIterationInGB =
Optional.of(request.getMaxSizeToMovePerIterationInGB());
}
- if(request.hasMaxSizeEnteringTargetInGB()) {
+ if (request.hasMaxSizeEnteringTargetInGB()) {
maxSizeEnteringTargetInGB =
Optional.of(request.getMaxSizeEnteringTargetInGB());
}
- if(request.hasMaxSizeLeavingSourceInGB()) {
+ if (request.hasMaxSizeLeavingSourceInGB()) {
maxSizeLeavingSourceInGB =
Optional.of(request.getMaxSizeLeavingSourceInGB());
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/ContainerSafeModeRule.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/ContainerSafeModeRule.java
index ef9d6f4..2a1c895 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/ContainerSafeModeRule.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/ContainerSafeModeRule.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* Class defining Safe mode exit criteria for Containers.
*/
public class ContainerSafeModeRule extends
- SafeModeExitRule<NodeRegistrationContainerReport>{
+ SafeModeExitRule<NodeRegistrationContainerReport> {
public static final Logger LOG =
LoggerFactory.getLogger(ContainerSafeModeRule.class);
@@ -115,7 +115,7 @@ public class ContainerSafeModeRule extends
reportsProto.getReport().getReportsList().forEach(c -> {
if (containerMap.containsKey(c.getContainerID())) {
- if(containerMap.remove(c.getContainerID()) != null) {
+ if (containerMap.remove(c.getContainerID()) != null) {
containerWithMinReplicas.getAndAdd(1);
getSafeModeMetrics()
.incCurrentContainersWithOneReplicaReportedCount();
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/DataNodeSafeModeRule.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/DataNodeSafeModeRule.java
index 0c4ce84..b03fedb 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/DataNodeSafeModeRule.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/DataNodeSafeModeRule.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.hdds.server.events.TypedEvent;
* registered with SCM.
*/
public class DataNodeSafeModeRule extends
- SafeModeExitRule<NodeRegistrationContainerReport>{
+ SafeModeExitRule<NodeRegistrationContainerReport> {
// Min DataNodes required to exit safe mode.
private int requiredDns;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
index c7b831b..fb4ba7d 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
@@ -204,7 +204,7 @@ public class SCMBlockProtocolServer implements
);
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logWriteSuccess(
buildAuditMessageForSuccess(SCMAction.ALLOCATE_BLOCK, auditMap)
);
@@ -274,7 +274,7 @@ public class SCMBlockProtocolServer implements
@Override
public ScmInfo getScmInfo() throws IOException {
boolean auditSuccess = true;
- try{
+ try {
ScmInfo.Builder builder =
new ScmInfo.Builder()
.setClusterId(scm.getScmStorageConfig().getClusterID())
@@ -287,7 +287,7 @@ public class SCMBlockProtocolServer implements
);
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logReadSuccess(
buildAuditMessageForSuccess(SCMAction.GET_SCM_INFO, null)
);
@@ -305,7 +305,7 @@ public class SCMBlockProtocolServer implements
auditMap.put("cluster", String.valueOf(request.getClusterId()));
auditMap.put("addr", String.valueOf(request.getRatisAddr()));
boolean auditSuccess = true;
- try{
+ try {
return scm.getScmHAManager().addSCM(request);
} catch (Exception ex) {
auditSuccess = false;
@@ -314,7 +314,7 @@ public class SCMBlockProtocolServer implements
);
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logReadSuccess(
buildAuditMessageForSuccess(SCMAction.ADD_SCM, auditMap)
);
@@ -326,12 +326,12 @@ public class SCMBlockProtocolServer implements
public List<DatanodeDetails> sortDatanodes(List<String> nodes,
String clientMachine) throws IOException {
boolean auditSuccess = true;
- try{
+ try {
NodeManager nodeManager = scm.getScmNodeManager();
Node client = null;
List<DatanodeDetails> possibleClients =
nodeManager.getNodesByAddress(clientMachine);
- if (possibleClients.size()>0){
+ if (possibleClients.size() > 0) {
client = possibleClients.get(0);
}
List<Node> nodeList = new ArrayList();
@@ -353,7 +353,7 @@ public class SCMBlockProtocolServer implements
);
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logReadSuccess(
buildAuditMessageForSuccess(SCMAction.SORT_DATANODE, null)
);
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
index 59e4b2b..9388a98 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
@@ -222,7 +222,7 @@ public class SCMClientProtocolServer implements
);
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logReadSuccess(
buildAuditMessageForSuccess(SCMAction.GET_CONTAINER, auditMap)
);
@@ -363,7 +363,7 @@ public class SCMClientProtocolServer implements
* replication factor.
*/
private boolean hasRequiredReplicas(ContainerInfo contInfo) {
- try{
+ try {
return getScm().getContainerManager()
.getContainerReplicas(contInfo.containerID())
.size() >= contInfo.getReplicationConfig().getRequiredNodes();
@@ -458,7 +458,7 @@ public class SCMClientProtocolServer implements
buildAuditMessageForFailure(SCMAction.LIST_CONTAINER, auditMap, ex));
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logReadSuccess(
buildAuditMessageForSuccess(SCMAction.LIST_CONTAINER, auditMap));
}
@@ -483,7 +483,7 @@ public class SCMClientProtocolServer implements
);
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logWriteSuccess(
buildAuditMessageForSuccess(SCMAction.DELETE_CONTAINER, auditMap)
);
@@ -643,7 +643,7 @@ public class SCMClientProtocolServer implements
@Override
public ScmInfo getScmInfo() throws IOException {
boolean auditSuccess = true;
- try{
+ try {
ScmInfo.Builder builder =
new ScmInfo.Builder()
.setClusterId(scm.getScmStorageConfig().getClusterID())
@@ -667,7 +667,7 @@ public class SCMClientProtocolServer implements
);
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logReadSuccess(
buildAuditMessageForSuccess(SCMAction.GET_SCM_INFO, null)
);
@@ -936,7 +936,8 @@ public class SCMClientProtocolServer implements
*/
@Override
public List<HddsProtos.DatanodeUsageInfoProto> getDatanodeUsageInfo(
- boolean mostUsed, int count) throws IOException, IllegalArgumentException{
+ boolean mostUsed, int count)
+ throws IOException, IllegalArgumentException {
// check admin authorisation
try {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
index 248c90c..fcadbf7 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
@@ -204,7 +204,7 @@ public class SCMDatanodeProtocolServer implements
buildAuditMessageForFailure(SCMAction.GET_VERSION, null, ex));
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logReadSuccess(
buildAuditMessageForSuccess(SCMAction.GET_VERSION, null));
}
@@ -249,7 +249,7 @@ public class SCMDatanodeProtocolServer implements
buildAuditMessageForFailure(SCMAction.REGISTER, auditMap, ex));
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logWriteSuccess(
buildAuditMessageForSuccess(SCMAction.REGISTER, auditMap));
}
@@ -284,7 +284,7 @@ public class SCMDatanodeProtocolServer implements
);
throw ex;
} finally {
- if(auditSuccess) {
+ if (auditSuccess) {
AUDIT.logWriteSuccess(
buildAuditMessageForSuccess(SCMAction.SEND_HEARTBEAT, auditMap)
);
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 85efdfb..2fb788d 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -557,7 +557,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
.build();
}
- if(configurator.getScmNodeManager() != null) {
+ if (configurator.getScmNodeManager() != null) {
scmNodeManager = configurator.getScmNodeManager();
} else {
scmNodeManager = new SCMNodeManager(conf, scmStorageConfig, eventQueue,
@@ -616,7 +616,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
scmHAManager,
getScmMetadataStore().getMoveTable());
}
- if(configurator.getScmSafeModeManager() != null) {
+ if (configurator.getScmSafeModeManager() != null) {
scmSafeModeManager = configurator.getScmSafeModeManager();
} else {
scmSafeModeManager = new SCMSafeModeManager(conf,
@@ -642,7 +642,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
// TODO: Support Certificate Server loading via Class Name loader.
// So it is easy to use different Certificate Servers if needed.
- if(this.scmMetadataStore == null) {
+ if (this.scmMetadataStore == null) {
LOG.error("Cannot initialize Certificate Server without a valid meta " +
"data layer.");
throw new SCMException("Cannot initialize CA without a valid metadata " +
@@ -796,7 +796,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
private void initalizeMetadataStore(OzoneConfiguration conf,
SCMConfigurator configurator)
throws IOException {
- if(configurator.getMetadataStore() != null) {
+ if (configurator.getMetadataStore() != null) {
scmMetadataStore = configurator.getMetadataStore();
} else {
scmMetadataStore = new SCMMetadataStoreImpl(conf);
@@ -977,7 +977,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
// will be persisted into the version file once this node gets added
// to existing SCM ring post node regular start up.
- if(OzoneSecurityUtil.isSecurityEnabled(conf)) {
+ if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
HASecurityUtils.initializeSecurity(scmStorageConfig, config,
getScmAddress(scmhaNodeDetails, conf), false);
}
@@ -1830,7 +1830,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
}
public StatusAndMessages finalizeUpgrade(String upgradeClientID)
- throws IOException{
+ throws IOException {
return upgradeFinalizer.finalize(upgradeClientID, this);
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java
index 1d8859f..030601a 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java
@@ -179,7 +179,7 @@ public class StorageContainerManagerStarter extends GenericCli {
@Override
public boolean init(OzoneConfiguration conf, String clusterId)
- throws IOException{
+ throws IOException {
return StorageContainerManager.scmInit(conf, clusterId);
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java
index 1fc4f76..feb58fc 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java
@@ -613,7 +613,7 @@ public final class HddsTestUtils {
conf.set(ScmConfigKeys.OZONE_SCM_DATANODE_ADDRESS_KEY, "127.0.0.1:0");
conf.set(ScmConfigKeys.OZONE_SCM_HTTP_ADDRESS_KEY, "127.0.0.1:0");
SCMStorageConfig scmStore = new SCMStorageConfig(conf);
- if(scmStore.getState() != Storage.StorageState.INITIALIZED) {
+ if (scmStore.getState() != Storage.StorageState.INITIALIZED) {
String clusterId = UUID.randomUUID().toString();
String scmId = UUID.randomUUID().toString();
scmStore.setClusterId(clusterId);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtil.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtil.java
index 20c0468..0c9222d 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtil.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtil.java
@@ -43,7 +43,7 @@ public class TestHddsServerUtil {
public Timeout timeout = Timeout.seconds(300);
@Rule
- public ExpectedException thrown= ExpectedException.none();
+ public ExpectedException thrown = ExpectedException.none();
/**
* Verify that the datanode endpoint is parsed correctly.
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtils.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtils.java
index f738650..8394c5a6 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtils.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestHddsServerUtils.java
@@ -56,7 +56,7 @@ public class TestHddsServerUtils {
public Timeout timeout = Timeout.seconds(300);;
@Rule
- public ExpectedException thrown= ExpectedException.none();
+ public ExpectedException thrown = ExpectedException.none();
/**
* Test getting OZONE_SCM_DATANODE_ADDRESS_KEY with port.
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
index e078b1f..e8bd07b 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
@@ -103,7 +103,7 @@ public class TestBlockManager {
public ExpectedException thrown = ExpectedException.none();
@Rule
- public TemporaryFolder folder= new TemporaryFolder();
+ public TemporaryFolder folder = new TemporaryFolder();
private SCMMetadataStore scmMetadataStore;
private ReplicationConfig replicationConfig;
@@ -452,7 +452,7 @@ public class TestBlockManager {
// the pipeline per raft log disk config is set to 1 by default
int numContainers = (int)Math.ceil((double)
(numContainerPerOwnerInPipeline *
- numContainerPerOwnerInPipeline)/numMetaDataVolumes);
+ numContainerPerOwnerInPipeline) / numMetaDataVolumes);
Assert.assertTrue(numContainers == pipelineManager.
getNumberOfContainers(pipeline.getId()));
Assert.assertTrue(
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
index f6cab87..9f7d9c2 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
@@ -532,7 +532,7 @@ public class MockNodeManager implements NodeManager {
@Override
public void addDatanodeCommand(UUID dnId, SCMCommand command) {
- if(commandMap.containsKey(dnId)) {
+ if (commandMap.containsKey(dnId)) {
List<SCMCommand> commandList = commandMap.get(dnId);
Preconditions.checkNotNull(commandList);
commandList.add(command);
@@ -601,7 +601,7 @@ public class MockNodeManager implements NodeManager {
}
public void clearCommandQueue(UUID dnId) {
- if(commandMap.containsKey(dnId)) {
+ if (commandMap.containsKey(dnId)) {
commandMap.put(dnId, new LinkedList<>());
}
}
@@ -799,7 +799,7 @@ public class MockNodeManager implements NodeManager {
if (uuids == null) {
return results;
}
- for(String uuid : uuids) {
+ for (String uuid : uuids) {
DatanodeDetails dn = getNodeByUuid(uuid);
if (dn != null) {
results.add(dn);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/SimpleMockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/SimpleMockNodeManager.java
index c015f18..3d8551d 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/SimpleMockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/SimpleMockNodeManager.java
@@ -82,7 +82,7 @@ public class SimpleMockNodeManager implements NodeManager {
*/
public void setPipelines(DatanodeDetails dd, int count) {
Set<PipelineID> pipelines = new HashSet<>();
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
pipelines.add(PipelineID.randomId());
}
pipelineMap.put(dd.getUuid(), pipelines);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
index c6bb279..528fa79 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
@@ -79,7 +79,7 @@ public class TestContainerManagerImpl {
@After
public void cleanup() throws Exception {
- if(containerManager != null) {
+ if (containerManager != null) {
containerManager.close();
}
@@ -125,12 +125,12 @@ public class TestContainerManagerImpl {
}
@Test
- public void testGetContainers() throws Exception{
+ public void testGetContainers() throws Exception {
Assert.assertTrue(
containerManager.getContainers().isEmpty());
ContainerID[] cidArray = new ContainerID[10];
- for(int i = 0; i < 10; i++){
+ for (int i = 0; i < 10; i++) {
ContainerInfo container = containerManager.allocateContainer(
new RatisReplicationConfig(
ReplicationFactor.THREE), "admin");
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
index 29cae36..93a2b67 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
@@ -352,7 +352,7 @@ public class TestIncrementalContainerReportHandler {
final ContainerReportsProto fullReport = TestContainerReportHandler
.getContainerReportsProto(containerTwo.containerID(), CLOSED,
datanode.getUuidString());
- final ContainerReportFromDatanode fcr =new ContainerReportFromDatanode(
+ final ContainerReportFromDatanode fcr = new ContainerReportFromDatanode(
datanode, fullReport);
// We need to run the FCR and ICR at the same time via the executor so we
@@ -363,7 +363,7 @@ public class TestIncrementalContainerReportHandler {
// Running this test 10 times to ensure the race condition we are testing
// for does not occur. In local tests, before the code was fixed, this
// test failed consistently every time (reproducing the issue).
- for (int i=0; i<10; i++) {
+ for (int i = 0; i < 10; i++) {
Future<?> t1 =
executor.submit(() -> fullReportHandler.onMessage(fcr, publisher));
Future<?> t2 =
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancer.java
index e6f32e0..b23482b 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancer.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancer.java
@@ -186,7 +186,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(100);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
expectedUnBalancedNodes =
determineExpectedUnBalancedNodes(randomThreshold);
@@ -219,7 +219,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(100);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
containerBalancer.stop();
Assert.assertEquals(0, containerBalancer.getUnBalancedNodes().size());
@@ -244,7 +244,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
Assert.assertFalse(
containerBalancer.getCountDatanodesInvolvedPerIteration() >
@@ -266,7 +266,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
containerBalancer.stop();
@@ -286,7 +286,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
containerBalancer.stop();
// check whether all selected containers are closed
@@ -310,7 +310,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
// balancer should not have moved more size than the limit
Assert.assertFalse(containerBalancer.getSizeMovedPerIteration() >
@@ -330,7 +330,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
containerBalancer.stop();
Map<DatanodeDetails, ContainerMoveSelection> sourceToTargetMap =
@@ -357,7 +357,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
containerBalancer.stop();
Map<DatanodeDetails, ContainerMoveSelection> sourceToTargetMap =
@@ -428,7 +428,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
containerBalancer.stop();
Set<ContainerID> containers = new HashSet<>();
@@ -455,7 +455,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
containerBalancer.stop();
Set<ContainerID> excludeContainers =
@@ -490,7 +490,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(500);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
containerBalancer.stop();
// balancer should have identified unbalanced nodes
@@ -513,7 +513,7 @@ public class TestContainerBalancer {
// modify this after balancer is fully completed
try {
Thread.sleep(500);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
containerBalancer.stop();
ContainerBalancerMetrics metrics = containerBalancer.getMetrics();
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java
index 37f4594..a830a71 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java
@@ -550,7 +550,7 @@ public class TestSCMContainerPlacementRackAware {
dn.setNodeStatus(new NodeStatus(DECOMMISSIONED, HEALTHY));
}
- for (int i=0; i<10; i++) {
+ for (int i = 0; i < 10; i++) {
// Set a random DN to in_service and ensure it is always picked
int index = new Random().nextInt(dnInfos.size());
dnInfos.get(index).setNodeStatus(NodeStatus.inServiceHealthy());
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAConfiguration.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAConfiguration.java
index 9ec10fc..5f82cce 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAConfiguration.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAConfiguration.java
@@ -64,7 +64,7 @@ public class TestSCMHAConfiguration {
conf.set(ScmConfigKeys.OZONE_SCM_SERVICE_IDS_KEY, scmServiceId);
String[] nodes = new String[] {"scm1", "scm2", "scm3"};
- conf.set(ScmConfigKeys.OZONE_SCM_NODES_KEY+"."+scmServiceId,
+ conf.set(ScmConfigKeys.OZONE_SCM_NODES_KEY + "." + scmServiceId,
"scm1,scm2,scm3");
conf.set(ScmConfigKeys.OZONE_SCM_NODE_ID_KEY, "scm1");
@@ -72,14 +72,14 @@ public class TestSCMHAConfiguration {
int i = 1;
for (String nodeId : nodes) {
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_BLOCK_CLIENT_ADDRESS_KEY,
- scmServiceId, nodeId), "localhost:"+port++);
+ scmServiceId, nodeId), "localhost:" + port++);
conf.setInt(ConfUtils.addKeySuffixes(OZONE_SCM_BLOCK_CLIENT_PORT_KEY,
scmServiceId, nodeId), port);
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_BLOCK_CLIENT_BIND_HOST_KEY,
scmServiceId, nodeId), "172.28.9.1");
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_SECURITY_SERVICE_ADDRESS_KEY,
- scmServiceId, nodeId), "localhost:"+port++);
+ scmServiceId, nodeId), "localhost:" + port++);
conf.setInt(ConfUtils.addKeySuffixes(OZONE_SCM_SECURITY_SERVICE_PORT_KEY,
scmServiceId, nodeId), port);
conf.set(ConfUtils.addKeySuffixes(
@@ -87,26 +87,26 @@ public class TestSCMHAConfiguration {
"172.28.9.1");
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_CLIENT_ADDRESS_KEY,
- scmServiceId, nodeId), "localhost:"+port++);
+ scmServiceId, nodeId), "localhost:" + port++);
conf.setInt(ConfUtils.addKeySuffixes(OZONE_SCM_CLIENT_PORT_KEY,
scmServiceId, nodeId), port);
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_CLIENT_BIND_HOST_KEY,
scmServiceId, nodeId), "172.28.9.1");
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_DATANODE_ADDRESS_KEY,
- scmServiceId, nodeId), "localhost:"+port++);
+ scmServiceId, nodeId), "localhost:" + port++);
conf.setInt(ConfUtils.addKeySuffixes(OZONE_SCM_DATANODE_PORT_KEY,
scmServiceId, nodeId), port);
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_DATANODE_BIND_HOST_KEY,
scmServiceId, nodeId), "172.28.9.1");
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_HTTP_ADDRESS_KEY,
- scmServiceId, nodeId), "localhost:"+port++);
+ scmServiceId, nodeId), "localhost:" + port++);
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_HTTP_BIND_HOST_KEY,
scmServiceId, nodeId), "172.28.9.1");
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_DB_DIRS,
- scmServiceId, nodeId), "/var/scm-metadata"+ i++);
+ scmServiceId, nodeId), "/var/scm-metadata" + i++);
conf.set(ConfUtils.addKeySuffixes(OZONE_SCM_ADDRESS_KEY,
scmServiceId, nodeId), "localhost");
@@ -121,7 +121,7 @@ public class TestSCMHAConfiguration {
port = 9880;
// Validate configs.
- Assert.assertEquals("localhost:"+port++,
+ Assert.assertEquals("localhost:" + port++,
conf.get(ConfUtils.addKeySuffixes(OZONE_SCM_BLOCK_CLIENT_ADDRESS_KEY,
scmServiceId, "scm1")));
Assert.assertEquals(port,
@@ -132,7 +132,7 @@ public class TestSCMHAConfiguration {
scmServiceId, "scm1")));
- Assert.assertEquals("localhost:"+port++,
+ Assert.assertEquals("localhost:" + port++,
conf.get(ConfUtils.addKeySuffixes(
OZONE_SCM_SECURITY_SERVICE_ADDRESS_KEY, scmServiceId, "scm1")));
Assert.assertEquals(port, conf.getInt(ConfUtils.addKeySuffixes(
@@ -142,7 +142,7 @@ public class TestSCMHAConfiguration {
OZONE_SCM_SECURITY_SERVICE_BIND_HOST_KEY, scmServiceId, "scm1")));
- Assert.assertEquals("localhost:"+port++,
+ Assert.assertEquals("localhost:" + port++,
conf.get(ConfUtils.addKeySuffixes(OZONE_SCM_CLIENT_ADDRESS_KEY,
scmServiceId, "scm1")));
Assert.assertEquals(port,
@@ -152,7 +152,7 @@ public class TestSCMHAConfiguration {
ConfUtils.addKeySuffixes(OZONE_SCM_CLIENT_BIND_HOST_KEY, scmServiceId,
"scm1")));
- Assert.assertEquals("localhost:"+port++,
+ Assert.assertEquals("localhost:" + port++,
conf.get(ConfUtils.addKeySuffixes(OZONE_SCM_DATANODE_ADDRESS_KEY,
scmServiceId, "scm1")));
Assert.assertEquals(port,
@@ -163,7 +163,7 @@ public class TestSCMHAConfiguration {
"scm1")));
- Assert.assertEquals("localhost:"+port++,
+ Assert.assertEquals("localhost:" + port++,
conf.get(ConfUtils.addKeySuffixes(OZONE_SCM_HTTP_ADDRESS_KEY,
scmServiceId, "scm1")));
Assert.assertEquals("172.28.9.1",
@@ -192,7 +192,7 @@ public class TestSCMHAConfiguration {
conf.set(ScmConfigKeys.OZONE_SCM_SERVICE_IDS_KEY, scmServiceId);
String[] nodes = new String[] {"scm1", "scm2", "scm3"};
- conf.set(ScmConfigKeys.OZONE_SCM_NODES_KEY+"."+scmServiceId,
+ conf.set(ScmConfigKeys.OZONE_SCM_NODES_KEY + "." + scmServiceId,
"scm1,scm2,scm3");
conf.set(ScmConfigKeys.OZONE_SCM_NODE_ID_KEY, "scm1");
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMRatisRequest.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMRatisRequest.java
index f5913aa..c352ca4 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMRatisRequest.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMRatisRequest.java
@@ -49,7 +49,7 @@ public class TestSCMRatisRequest {
}
@Test(expected = InvalidProtocolBufferException.class)
- public void testEncodeWithNonProto() throws Exception{
+ public void testEncodeWithNonProto() throws Exception {
PipelineID pipelineID = PipelineID.randomId();
// Non proto args
Object[] args = new Object[] {pipelineID};
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/metadata/TestPipelineIDCodec.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/metadata/TestPipelineIDCodec.java
index 5543be5..834b539 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/metadata/TestPipelineIDCodec.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/metadata/TestPipelineIDCodec.java
@@ -57,7 +57,7 @@ public class TestPipelineIDCodec {
@Test
public void testPersistingARandomUUID() throws Exception {
- for (int i=0; i<100; i++) {
+ for (int i = 0; i < 100; i++) {
UUID uuid = UUID.randomUUID();
long mask = 0x0000_0000_0000_00FFL;
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
index b307b57..63ecb29 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
@@ -212,7 +212,7 @@ public class TestContainerPlacement {
assertEquals(remaining * nodeCount,
(long) scmNodeManager.getStats().getRemaining().get());
- xceiverClientManager= new XceiverClientManager(conf);
+ xceiverClientManager = new XceiverClientManager(conf);
ContainerInfo container = containerManager
.allocateContainer(
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
index 80b7240..8c69116 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
@@ -105,7 +105,7 @@ public class TestDatanodeAdminMonitor {
*/
@Test
public void testClosePipelinesEventFiredWhenAdminStarted()
- throws NodeNotFoundException{
+ throws NodeNotFoundException {
DatanodeDetails dn1 = MockDatanodeDetails.randomDatanodeDetails();
nodeManager.register(dn1,
new NodeStatus(HddsProtos.NodeOperationalState.DECOMMISSIONING,
@@ -425,7 +425,7 @@ public class TestDatanodeAdminMonitor {
*/
private Set<ContainerID> generateContainers(int count) {
Set<ContainerID> containers = new HashSet<>();
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
containers.add(ContainerID.valueOf(i));
}
return containers;
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
index 4373238..792d62f 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
@@ -94,12 +94,12 @@ public class TestNodeDecommissionManager {
@Test
public void testAnyInvalidHostThrowsException()
- throws InvalidHostStringException{
+ throws InvalidHostStringException {
List<DatanodeDetails> dns = generateDatanodes();
// Try to decommission a host that does exist, but give incorrect port
try {
- decom.decommissionNodes(Arrays.asList(dns.get(1).getIpAddress()+":10"));
+ decom.decommissionNodes(Arrays.asList(dns.get(1).getIpAddress() + ":10"));
fail("InvalidHostStringException expected");
} catch (InvalidHostStringException e) {
}
@@ -131,7 +131,7 @@ public class TestNodeDecommissionManager {
// that does not exist
try {
decom.decommissionNodes(Arrays.asList(
- dns.get(0).getIpAddress()+":10"));
+ dns.get(0).getIpAddress() + ":10"));
fail("InvalidHostStringException expected");
} catch (InvalidHostStringException e) {
}
@@ -159,7 +159,7 @@ public class TestNodeDecommissionManager {
// and we hardcoded ports to 3456, 4567, 5678
DatanodeDetails multiDn = dns.get(10);
String multiAddr =
- multiDn.getIpAddress()+":"+multiDn.getPorts().get(0).getValue();
+ multiDn.getIpAddress() + ":" + multiDn.getPorts().get(0).getValue();
decom.decommissionNodes(Arrays.asList(multiAddr));
assertEquals(HddsProtos.NodeOperationalState.DECOMMISSIONING,
nodeManager.getNodeStatus(multiDn).getOperationalState());
@@ -202,7 +202,7 @@ public class TestNodeDecommissionManager {
// and we hardcoded ports to 3456, 4567, 5678
DatanodeDetails multiDn = dns.get(10);
String multiAddr =
- multiDn.getIpAddress()+":"+multiDn.getPorts().get(0).getValue();
+ multiDn.getIpAddress() + ":" + multiDn.getPorts().get(0).getValue();
decom.startMaintenanceNodes(Arrays.asList(multiAddr), 100);
assertEquals(HddsProtos.NodeOperationalState.ENTERING_MAINTENANCE,
nodeManager.getNodeStatus(multiDn).getOperationalState());
@@ -296,7 +296,7 @@ public class TestNodeDecommissionManager {
*/
private List<DatanodeDetails> generateDatanodes() {
List<DatanodeDetails> dns = new ArrayList<>();
- for (int i=0; i<10; i++) {
+ for (int i = 0; i < 10; i++) {
DatanodeDetails dn = MockDatanodeDetails.randomDatanodeDetails();
dns.add(dn);
nodeManager.register(dn, null, null);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeStateManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeStateManager.java
index da87d18..31ecbf6 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeStateManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeStateManager.java
@@ -304,7 +304,7 @@ public class TestNodeStateManager {
if (events.size() == 0) {
return null;
} else {
- return events.get(events.size()-1);
+ return events.get(events.size() - 1);
}
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
index ab87a59..ea8a184 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
@@ -457,7 +457,7 @@ public class TestSCMNodeManager {
// these pipelines use nodes outside of allowedDNs.
if (success) {
for (Pipeline pipeline: pipelines) {
- for(DatanodeDetails pipelineDN: pipeline.getNodes()) {
+ for (DatanodeDetails pipelineDN: pipeline.getNodes()) {
// Do not wait for this condition to be true. Disallowed DNs should
// never be used once we have the expected number of pipelines.
if (!allowedDnIds.contains(pipelineDN.getUuidString())) {
@@ -1762,7 +1762,7 @@ public class TestSCMNodeManager {
final int nodeCount = 6;
SCMNodeManager nodeManager = createNodeManager(conf);
- for (int i=0; i<nodeCount; i++) {
+ for (int i = 0; i < nodeCount; i++) {
DatanodeDetails datanodeDetails =
MockDatanodeDetails.randomDatanodeDetails();
final long capacity = 2000;
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/states/TestNodeStateMap.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/states/TestNodeStateMap.java
index 4de5eea..303d368 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/states/TestNodeStateMap.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/states/TestNodeStateMap.java
@@ -98,8 +98,8 @@ public class TestNodeStateMap {
throws NodeAlreadyExistsException {
// Add one node for all possible states
int nodeCount = 0;
- for(NodeOperationalState op : NodeOperationalState.values()) {
- for(NodeState health : NodeState.values()) {
+ for (NodeOperationalState op : NodeOperationalState.values()) {
+ for (NodeState health : NodeState.values()) {
addRandomNodeWithState(op, health);
nodeCount++;
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java
index fec2f2e..9b4d0a8 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java
@@ -110,7 +110,7 @@ public class TestPipelineDatanodesIntersection {
@Test
public void testPipelineDatanodesIntersection() throws IOException {
- NodeManager nodeManager= new MockNodeManager(true, nodeCount);
+ NodeManager nodeManager = new MockNodeManager(true, nodeCount);
conf.setInt(OZONE_DATANODE_PIPELINE_LIMIT, nodeHeaviness);
conf.setBoolean(OZONE_SCM_PIPELINE_AUTO_CREATE_FACTOR_ONE, false);
SCMHAManager scmhaManager = MockSCMHAManager.getInstance(true);
@@ -157,7 +157,7 @@ public class TestPipelineDatanodesIntersection {
}
}
createdPipelineCount++;
- } catch(SCMException e) {
+ } catch (SCMException e) {
end = true;
} catch (IOException e) {
end = true;
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java
index efb391e..cad4f48 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java
@@ -250,7 +250,7 @@ public class TestPipelinePlacementPolicy {
new ArrayList<>(datanodes.size()), nodesRequired,
0, 10 * OzoneConsts.TB);
Assert.fail("SCMException should have been thrown.");
- } catch(SCMException ex) {
+ } catch (SCMException ex) {
Assert.assertTrue(ex.getMessage().contains(expectedMessageSubstring));
}
@@ -260,13 +260,13 @@ public class TestPipelinePlacementPolicy {
new ArrayList<>(datanodes.size()), nodesRequired, 10 * OzoneConsts.TB,
0);
Assert.fail("SCMException should have been thrown.");
- } catch(SCMException ex) {
+ } catch (SCMException ex) {
Assert.assertTrue(ex.getMessage().contains(expectedMessageSubstring));
}
}
@Test
- public void testPickLowestLoadAnchor() throws IOException{
+ public void testPickLowestLoadAnchor() throws IOException {
List<DatanodeDetails> healthyNodes = nodeManager
.getNodes(NodeStatus.inServiceHealthy());
@@ -343,7 +343,7 @@ public class TestPipelinePlacementPolicy {
}
@Test
- public void testRackAwarenessNotEnabledWithFallBack() throws SCMException{
+ public void testRackAwarenessNotEnabledWithFallBack() throws SCMException {
DatanodeDetails anchor = placementPolicy
.chooseNode(nodesWithOutRackAwareness);
DatanodeDetails randomNode = placementPolicy
@@ -425,12 +425,12 @@ public class TestPipelinePlacementPolicy {
}
@Test
- public void testHeavyNodeShouldBeExcluded() throws SCMException{
+ public void testHeavyNodeShouldBeExcluded() throws SCMException {
List<DatanodeDetails> healthyNodes =
nodeManager.getNodes(NodeStatus.inServiceHealthy());
int nodesRequired = HddsProtos.ReplicationFactor.THREE.getNumber();
// only minority of healthy NODES are heavily engaged in pipelines.
- int minorityHeavy = healthyNodes.size()/2 - 1;
+ int minorityHeavy = healthyNodes.size() / 2 - 1;
List<DatanodeDetails> pickedNodes1 = placementPolicy.chooseDatanodes(
new ArrayList<>(PIPELINE_PLACEMENT_MAX_NODES_COUNT),
new ArrayList<>(PIPELINE_PLACEMENT_MAX_NODES_COUNT),
@@ -443,7 +443,7 @@ public class TestPipelinePlacementPolicy {
Assert.assertTrue(checkDuplicateNodesUUID(pickedNodes1));
// majority of healthy NODES are heavily engaged in pipelines.
- int majorityHeavy = healthyNodes.size()/2 + 2;
+ int majorityHeavy = healthyNodes.size() / 2 + 2;
insertHeavyNodesIntoNodeManager(healthyNodes, majorityHeavy);
boolean thrown = false;
List<DatanodeDetails> pickedNodes2 = null;
@@ -627,7 +627,7 @@ public class TestPipelinePlacementPolicy {
}
private void insertHeavyNodesIntoNodeManager(
- List<DatanodeDetails> nodes, int heavyNodeCount) throws SCMException{
+ List<DatanodeDetails> nodes, int heavyNodeCount) throws SCMException {
if (nodes == null) {
throw new SCMException("",
SCMException.ResultCodes.FAILED_TO_FIND_SUITABLE_NODE);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
index d1f383c..3d1a707 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
@@ -289,7 +289,7 @@ public class TestRatisPipelineProvider {
provider.create(new RatisReplicationConfig(factor));
Assert.fail("Expected SCMException for large container size with " +
"replication factor " + factor.toString());
- } catch(SCMException ex) {
+ } catch (SCMException ex) {
Assert.assertTrue(ex.getMessage().contains(expectedErrorSubstring));
}
}
@@ -302,7 +302,7 @@ public class TestRatisPipelineProvider {
provider.create(new RatisReplicationConfig(factor));
Assert.fail("Expected SCMException for large metadata size with " +
"replication factor " + factor.toString());
- } catch(SCMException ex) {
+ } catch (SCMException ex) {
Assert.assertTrue(ex.getMessage().contains(expectedErrorSubstring));
}
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
index c9840e7..83419e6 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
@@ -133,7 +133,7 @@ public class TestOneReplicaPipelineSafeModeRule {
LoggerFactory.getLogger(SCMSafeModeManager.class));
List<Pipeline> pipelines = pipelineManager.getPipelines();
- firePipelineEvent(pipelines.subList(0, pipelineFactorThreeCount -1));
+ firePipelineEvent(pipelines.subList(0, pipelineFactorThreeCount - 1));
// As 90% of 7 with ceil is 7, if we send 6 pipeline reports, rule
// validate should be still false.
@@ -144,7 +144,7 @@ public class TestOneReplicaPipelineSafeModeRule {
Assert.assertFalse(rule.validate());
//Fire last pipeline event from datanode.
- firePipelineEvent(pipelines.subList(pipelineFactorThreeCount -1,
+ firePipelineEvent(pipelines.subList(pipelineFactorThreeCount - 1,
pipelineFactorThreeCount));
GenericTestUtils.waitFor(() -> rule.validate(), 1000, 5000);
@@ -181,13 +181,13 @@ public class TestOneReplicaPipelineSafeModeRule {
pipelineManager.getPipelines(
new RatisReplicationConfig(ReplicationFactor.THREE));
- firePipelineEvent(pipelines.subList(0, pipelineCountThree -1));
+ firePipelineEvent(pipelines.subList(0, pipelineCountThree - 1));
GenericTestUtils.waitFor(() -> logCapturer.getOutput().contains(
"reported count is 6"), 1000, 5000);
//Fire last pipeline event from datanode.
- firePipelineEvent(pipelines.subList(pipelineCountThree -1,
+ firePipelineEvent(pipelines.subList(pipelineCountThree - 1,
pipelineCountThree));
GenericTestUtils.waitFor(() -> rule.validate(), 1000, 5000);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java
index ef6345e..cb200f2 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java
@@ -435,7 +435,7 @@ public class TestSCMSafeModeManager {
}, 100, 1000 * 5);
}
- private void checkHealthy(int expectedCount) throws Exception{
+ private void checkHealthy(int expectedCount) throws Exception {
GenericTestUtils.waitFor(() -> scmSafeModeManager
.getHealthyPipelineSafeModeRule()
.getCurrentHealthyPipelineCount() == expectedCount,
@@ -548,14 +548,14 @@ public class TestSCMSafeModeManager {
assertTrue(scmSafeModeManager.getInSafeMode());
// Register all DataNodes except last one and assert SCM is in safe mode.
- for (int i = 0; i < numOfDns-1; i++) {
+ for (int i = 0; i < numOfDns - 1; i++) {
queue.fireEvent(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
HddsTestUtils.createNodeRegistrationContainerReport(containers));
assertTrue(scmSafeModeManager.getInSafeMode());
assertTrue(scmSafeModeManager.getCurrentContainerThreshold() == 1);
}
- if(numOfDns == 0){
+ if (numOfDns == 0) {
GenericTestUtils.waitFor(() -> {
return scmSafeModeManager.getInSafeMode();
}, 10, 1000 * 10);
@@ -586,7 +586,7 @@ public class TestSCMSafeModeManager {
containers.addAll(HddsTestUtils.getContainerInfo(25 * 4));
String storageDir = GenericTestUtils.getTempPath(
TestSCMSafeModeManager.class.getName() + UUID.randomUUID());
- try{
+ try {
MockNodeManager nodeManager = new MockNodeManager(true, 3);
config.set(HddsConfigKeys.OZONE_METADATA_DIRS, storageDir);
// enable pipeline check
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMCertStore.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMCertStore.java
index 5ddbe55..7ad118c 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMCertStore.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMCertStore.java
@@ -193,7 +193,7 @@ public class TestSCMCertStore {
// Generate 3 more certificates and revoke 2 of them
List<BigInteger> newSerialIDs = new ArrayList<>();
- for (int i = 0; i<3; i++) {
+ for (int i = 0; i < 3; i++) {
X509Certificate cert = generateX509Cert();
scmCertStore.storeValidCertificate(cert.getSerialNumber(), cert, SCM);
newSerialIDs.add(cert.getSerialNumber());
@@ -250,7 +250,7 @@ public class TestSCMCertStore {
scmCertStore.storeValidCertificate(serialID, x509Certificate, SCM);
Date now = new Date();
// Set revocation time in the future
- Date revocationTime = new Date(now.getTime()+500);
+ Date revocationTime = new Date(now.getTime() + 500);
X509CertificateHolder caCertificateHolder =
new X509CertificateHolder(generateX509Cert().getEncoded());
@@ -282,7 +282,7 @@ public class TestSCMCertStore {
private long getTableSize(Iterator iterator) {
long size = 0;
- while(iterator.hasNext()) {
+ while (iterator.hasNext()) {
size++;
iterator.next();
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/update/server/TestSCMUpdateServiceGrpcServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/update/server/TestSCMUpdateServiceGrpcServer.java
index 47495c9..e7b2c57 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/update/server/TestSCMUpdateServiceGrpcServer.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/update/server/TestSCMUpdateServiceGrpcServer.java
@@ -57,7 +57,7 @@ public class TestSCMUpdateServiceGrpcServer {
public Timeout timeout = Timeout.seconds(300);
@Rule
- public ExpectedException thrown= ExpectedException.none();
+ public ExpectedException thrown = ExpectedException.none();
@Rule
public final TemporaryFolder tempDir = new TemporaryFolder();
@@ -129,13 +129,13 @@ public class TestSCMUpdateServiceGrpcServer {
}
server.notifyCrlUpdate();
- GenericTestUtils.waitFor(() -> client.getUpdateCount()==4, 100, 2000);
+ GenericTestUtils.waitFor(() -> client.getUpdateCount() == 4, 100, 2000);
Assert.assertEquals(4, client.getUpdateCount());
Assert.assertEquals(0, client.getErrorCount());
revokeCertNow(certIds.get(5));
server.notifyCrlUpdate();
- GenericTestUtils.waitFor(() -> client.getUpdateCount()>4, 100, 2000);
+ GenericTestUtils.waitFor(() -> client.getUpdateCount() > 4, 100, 2000);
Assert.assertEquals(5, client.getUpdateCount());
Assert.assertEquals(0, client.getErrorCount());
} catch (Exception e) {
@@ -178,7 +178,7 @@ public class TestSCMUpdateServiceGrpcServer {
revokeCertNow((certIds.get(0)));
server.notifyCrlUpdate();
- GenericTestUtils.waitFor(() -> client.getUpdateCount()==1,
+ GenericTestUtils.waitFor(() -> client.getUpdateCount() == 1,
100, 2000);
Assert.assertEquals(1, client.getUpdateCount());
Assert.assertEquals(0, client.getErrorCount());
@@ -186,14 +186,14 @@ public class TestSCMUpdateServiceGrpcServer {
// revoke cert 5 with 10 seconds delay
revokeCert(certIds.get(5), Instant.now().plus(Duration.ofSeconds(5)));
server.notifyCrlUpdate();
- GenericTestUtils.waitFor(() -> client.getUpdateCount()>1,
+ GenericTestUtils.waitFor(() -> client.getUpdateCount() > 1,
100, 2000);
Assert.assertTrue(2 <= client.getUpdateCount());
Assert.assertEquals(0, client.getErrorCount());
Assert.assertTrue(1 >= client.getClientCRLStore()
.getPendingCrlIds().size());
- GenericTestUtils.waitFor(() -> client.getPendingCrlRemoveCount()==1,
+ GenericTestUtils.waitFor(() -> client.getPendingCrlRemoveCount() == 1,
100, 20_000);
Assert.assertTrue(client.getClientCRLStore()
.getPendingCrlIds().isEmpty());
@@ -243,7 +243,7 @@ public class TestSCMUpdateServiceGrpcServer {
revokeCertNow((certIds.get(i)));
}
server.notifyCrlUpdate();
- GenericTestUtils.waitFor(() -> client.getUpdateCount()==4,
+ GenericTestUtils.waitFor(() -> client.getUpdateCount() == 4,
100, 2000);
Assert.assertEquals(4, client.getUpdateCount());
@@ -257,7 +257,7 @@ public class TestSCMUpdateServiceGrpcServer {
// client retry connect to the server. The client will handle that.
server.stop();
server.start();
- GenericTestUtils.waitFor(() -> client.getErrorCount()==1,
+ GenericTestUtils.waitFor(() -> client.getErrorCount() == 1,
100, 2000);
Assert.assertEquals(4, client.getUpdateCount());
Assert.assertEquals(1, client.getErrorCount());
@@ -266,7 +266,7 @@ public class TestSCMUpdateServiceGrpcServer {
revokeCertNow(certIds.get(5));
server.notifyCrlUpdate();
- GenericTestUtils.waitFor(() -> client.getUpdateCount()>4,
+ GenericTestUtils.waitFor(() -> client.getUpdateCount() > 4,
100, 5000);
Assert.assertEquals(5, client.getUpdateCount());
Assert.assertEquals(1, client.getErrorCount());
@@ -282,16 +282,16 @@ public class TestSCMUpdateServiceGrpcServer {
client.createChannel();
client.start();
Assert.assertEquals(5, clientCRLStore.getLatestCrlId());
- GenericTestUtils.waitFor(() -> client.getUpdateCount()>5,
+ GenericTestUtils.waitFor(() -> client.getUpdateCount() > 5,
100, 2000);
revokeCertNow(certIds.get(6));
// mostly noop
server.notifyCrlUpdate();
LOG.info("Test client restart end.");
- GenericTestUtils.waitFor(() -> client.getUpdateCount()>6,
+ GenericTestUtils.waitFor(() -> client.getUpdateCount() > 6,
100, 2000);
- Assert.assertTrue(client.getUpdateCount()>=6);
+ Assert.assertTrue(client.getUpdateCount() >= 6);
Assert.assertEquals(2, client.getErrorCount());
Assert.assertEquals(6, clientCRLStore.getLatestCrlId());
} catch (Exception e) {
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/TestScmStartupSlvLessThanMlv.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/TestScmStartupSlvLessThanMlv.java
index 9cdad81..762f946 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/TestScmStartupSlvLessThanMlv.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/upgrade/TestScmStartupSlvLessThanMlv.java
@@ -66,7 +66,7 @@ public class TestScmStartupSlvLessThanMlv {
try {
new StorageContainerManager(conf);
Assert.fail("Expected IOException due to incorrect MLV on SCM creation.");
- } catch(IOException e) {
+ } catch (IOException e) {
String expectedMessage = String.format("Metadata layout version (%s) > " +
"software layout version (%s)", mlv, largestSlv);
GenericTestUtils.assertExceptionContains(expectedMessage, e);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
index 33fb355..4db75d2 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/testutils/ReplicationNodeManagerMock.java
@@ -183,7 +183,7 @@ public class ReplicationNodeManagerMock implements NodeManager {
* @return DatanodeUsageInfo of the specified datanode
*/
@Override
- public DatanodeUsageInfo getUsageInfo(DatanodeDetails dn){
+ public DatanodeUsageInfo getUsageInfo(DatanodeDetails dn) {
return null;
}
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java
index a1e4740..61dd5bf 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java
@@ -521,7 +521,7 @@ public final class LambdaTestUtils {
throws Exception {
return intercept(clazz, contained,
"Expecting " + clazz.getName()
- + (contained != null? (" with text " + contained) : "")
+ + (contained != null ? (" with text " + contained) : "")
+ " but got ",
() -> {
eval.call();
@@ -589,7 +589,7 @@ public final class LambdaTestUtils {
T expected,
Optional<T> actual) {
Assert.assertNotNull(message, actual);
- Assert.assertTrue(message +" -not present", actual.isPresent());
+ Assert.assertTrue(message + " -not present", actual.isPresent());
Assert.assertEquals(message, expected, actual.get());
}
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
index e0cd436bd..44e4d4c 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStatusSubcommand.java
@@ -36,7 +36,7 @@ public class ContainerBalancerStatusSubcommand extends ScmSubcommand {
@Override
public void execute(ScmClient scmClient) throws IOException {
boolean execReturn = scmClient.getContainerBalancerStatus();
- if(execReturn){
+ if (execReturn) {
System.out.println("ContainerBalancer is Running.");
} else {
System.out.println("ContainerBalancer is Not Running.");
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStatusSubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStatusSubcommand.java
index c6800be..9bc3649 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStatusSubcommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ReplicationManagerStatusSubcommand.java
@@ -43,7 +43,7 @@ public class ReplicationManagerStatusSubcommand extends ScmSubcommand {
boolean execReturn = scmClient.getReplicationManagerStatus();
// Output data list
- if(execReturn){
+ if (execReturn) {
LOG.info("ReplicationManager is Running.");
} else {
LOG.info("ReplicationManager is Not Running.");
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
index ba359af..db2f02c 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
@@ -51,7 +51,7 @@ public class SafeModeCheckSubcommand extends ScmSubcommand {
boolean execReturn = scmClient.inSafeMode();
// Output data list
- if(execReturn){
+ if (execReturn) {
LOG.info("SCM is in safe mode.");
if (verbose) {
for (Map.Entry<String, Pair<Boolean, String>> entry :
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeExitSubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeExitSubcommand.java
index 12490c5..bcf64de 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeExitSubcommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeExitSubcommand.java
@@ -42,7 +42,7 @@ public class SafeModeExitSubcommand extends ScmSubcommand {
@Override
public void execute(ScmClient scmClient) throws IOException {
boolean execReturn = scmClient.forceExitSafeMode();
- if(execReturn){
+ if (execReturn) {
LOG.info("SCM exit safe mode successfully.");
}
}
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionSubCommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionSubCommand.java
index 232cc8d..23ff917 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionSubCommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionSubCommand.java
@@ -52,7 +52,7 @@ public class DecommissionSubCommand extends ScmSubcommand {
String.join("\n", hosts));
if (errors.size() > 0) {
for (DatanodeAdminError error : errors) {
- System.err.println("Error: " + error.getHostname() +": "
+ System.err.println("Error: " + error.getHostname() + ": "
+ error.getError());
}
// Throwing the exception will cause a non-zero exit status for the
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/MaintenanceSubCommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/MaintenanceSubCommand.java
index 6d59e3c..a64c400 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/MaintenanceSubCommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/MaintenanceSubCommand.java
@@ -45,7 +45,7 @@ public class MaintenanceSubCommand extends ScmSubcommand {
private List<String> hosts = new ArrayList<>();
@CommandLine.Option(names = {"--end"},
- description = "Automatically end maintenance after the given hours. "+
+ description = "Automatically end maintenance after the given hours. " +
"By default, maintenance must be ended manually.")
private int endInHours = 0;
@@ -58,7 +58,7 @@ public class MaintenanceSubCommand extends ScmSubcommand {
String.join("\n", hosts));
if (errors.size() > 0) {
for (DatanodeAdminError error : errors) {
- System.err.println("Error: " + error.getHostname() +": "
+ System.err.println("Error: " + error.getHostname() + ": "
+ error.getError());
}
// Throwing the exception will cause a non-zero exit status for the
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/RecommissionSubCommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/RecommissionSubCommand.java
index 94b97db..61f7826 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/RecommissionSubCommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/RecommissionSubCommand.java
@@ -53,7 +53,7 @@ public class RecommissionSubCommand extends ScmSubcommand {
String.join("\n", hosts));
if (errors.size() > 0) {
for (DatanodeAdminError error : errors) {
- System.err.println("Error: " + error.getHostname() +": "
+ System.err.println("Error: " + error.getHostname() + ": "
+ error.getError());
}
// Throwing the exception will cause a non-zero exit status for the
diff --git a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
index 5c71076..be0e2c8 100644
--- a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
+++ b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
@@ -73,7 +73,7 @@ public class TestReportSubCommand {
for (HddsProtos.LifeCycleState state : HddsProtos.LifeCycleState.values()) {
Pattern p = Pattern.compile(
- "^"+state.toString() + ": 0$", Pattern.MULTILINE);
+ "^" + state.toString() + ": 0$", Pattern.MULTILINE);
Matcher m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
}
@@ -81,7 +81,7 @@ public class TestReportSubCommand {
for (ReplicationManagerReport.HealthState state :
ReplicationManagerReport.HealthState.values()) {
Pattern p = Pattern.compile(
- "^"+state.toString() + ": 0$", Pattern.MULTILINE);
+ "^" + state.toString() + ": 0$", Pattern.MULTILINE);
Matcher m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
}
@@ -98,7 +98,7 @@ public class TestReportSubCommand {
int counter = SEED;
for (HddsProtos.LifeCycleState state : HddsProtos.LifeCycleState.values()) {
Pattern p = Pattern.compile(
- "^"+state.toString() + ": " + counter + "$", Pattern.MULTILINE);
+ "^" + state.toString() + ": " + counter + "$", Pattern.MULTILINE);
Matcher m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
counter++;
@@ -108,13 +108,13 @@ public class TestReportSubCommand {
for (ReplicationManagerReport.HealthState state :
ReplicationManagerReport.HealthState.values()) {
Pattern p = Pattern.compile(
- "^"+state.toString() + ": " + counter + "$", Pattern.MULTILINE);
+ "^" + state.toString() + ": " + counter + "$", Pattern.MULTILINE);
Matcher m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
// Check the correct samples are returned
p = Pattern.compile(
- "^First 100 "+ state + " containers:\n"
+ "^First 100 " + state + " containers:\n"
+ containerList(0, counter) + "$", Pattern.MULTILINE);
m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
@@ -151,7 +151,7 @@ public class TestReportSubCommand {
if (i != start) {
sb.append(", ");
}
- sb.append("#"+i);
+ sb.append("#" + i);
}
return sb.toString();
}
diff --git a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
index 70c74a9..69b0efb 100644
--- a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
+++ b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
@@ -90,7 +90,7 @@ public class TestListInfoSubcommand {
assertTrue(m.find());
for (HddsProtos.NodeState state : HddsProtos.NodeState.values()) {
p = Pattern.compile(
- "^Health State:\\s+"+state+"$", Pattern.MULTILINE);
+ "^Health State:\\s+" + state + "$", Pattern.MULTILINE);
m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
}
@@ -106,11 +106,11 @@ public class TestListInfoSubcommand {
private List<HddsProtos.Node> getNodeDetails() {
List<HddsProtos.Node> nodes = new ArrayList<>();
- for (int i=0; i<4; i++) {
+ for (int i = 0; i < 4; i++) {
HddsProtos.DatanodeDetailsProto.Builder dnd =
HddsProtos.DatanodeDetailsProto.newBuilder();
dnd.setHostName("host" + i);
- dnd.setIpAddress("1.2.3." + i+1);
+ dnd.setIpAddress("1.2.3." + i + 1);
dnd.setNetworkLocation("/default");
dnd.setNetworkName("host" + i);
dnd.addPorts(HddsProtos.Port.newBuilder()
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
index 1f819ac..2412b88 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
@@ -207,7 +207,7 @@ public class ObjectStore {
public Iterator<? extends OzoneVolume> listVolumesByUser(String user,
String volumePrefix, String prevVolume)
throws IOException {
- if(Strings.isNullOrEmpty(user)) {
+ if (Strings.isNullOrEmpty(user)) {
user = UserGroupInformation.getCurrentUser().getUserName();
}
return new VolumeIterator(user, volumePrefix, prevVolume);
@@ -269,7 +269,7 @@ public class ObjectStore {
@Override
public OzoneVolume next() {
- if(hasNext()) {
+ if (hasNext()) {
currentValue = currentIterator.next();
return currentValue;
}
@@ -284,7 +284,7 @@ public class ObjectStore {
private List<OzoneVolume> getNextListOfVolumes(String prevVolume) {
try {
//if user is null, we do list of all volumes.
- if(user != null) {
+ if (user != null) {
return proxy.listVolumes(user, volPrefix, prevVolume, listCacheSize);
}
return proxy.listVolumes(volPrefix, prevVolume, listCacheSize);
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
index 16d5a1b..a292ae2 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
@@ -611,7 +611,7 @@ public class OzoneBucket extends WithMetadata {
* @return {@code Iterator<OzoneKey>}
*/
public Iterator<? extends OzoneKey> listKeys(String keyPrefix)
- throws IOException{
+ throws IOException {
return listKeys(keyPrefix, null);
}
@@ -910,7 +910,7 @@ public class OzoneBucket extends WithMetadata {
* @param userName new owner
* @throws IOException
*/
- public boolean setOwner(String userName) throws IOException{
+ public boolean setOwner(String userName) throws IOException {
boolean result = proxy.setBucketOwner(volumeName, name, userName);
this.owner = userName;
return result;
@@ -939,7 +939,7 @@ public class OzoneBucket extends WithMetadata {
* The returned keys match key prefix.
* @param keyPrefix
*/
- KeyIterator(String keyPrefix, String prevKey) throws IOException{
+ KeyIterator(String keyPrefix, String prevKey) throws IOException {
setKeyPrefix(keyPrefix);
this.currentValue = null;
this.currentIterator = getNextListOfKeys(prevKey).iterator();
@@ -947,7 +947,7 @@ public class OzoneBucket extends WithMetadata {
@Override
public boolean hasNext() {
- if(!currentIterator.hasNext() && currentValue != null) {
+ if (!currentIterator.hasNext() && currentValue != null) {
try {
currentIterator =
getNextListOfKeys(currentValue.getName()).iterator();
@@ -960,7 +960,7 @@ public class OzoneBucket extends WithMetadata {
@Override
public OzoneKey next() {
- if(hasNext()) {
+ if (hasNext()) {
currentValue = currentIterator.next();
return currentValue;
}
@@ -1008,7 +1008,7 @@ public class OzoneBucket extends WithMetadata {
*
* Note: Does not guarantee to return the list of keys in a sorted order.
*/
- private class KeyIteratorWithFSO extends KeyIterator{
+ private class KeyIteratorWithFSO extends KeyIterator {
private Stack<String> stack;
private List<OzoneKey> pendingItemsToBeBatched;
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientFactory.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientFactory.java
index 9bf3973..2830bb1 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientFactory.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientFactory.java
@@ -51,7 +51,7 @@ public final class OzoneClientFactory {
/**
* Private constructor, class is not meant to be initialized.
*/
- private OzoneClientFactory(){}
+ private OzoneClientFactory() { }
/**
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneKey.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneKey.java
index 9326bed..e37969d 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneKey.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneKey.java
@@ -107,7 +107,7 @@ public class OzoneKey {
*
* @return bucketName
*/
- public String getBucketName(){
+ public String getBucketName() {
return bucketName;
}
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
index 3847b12..389ccf8 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
@@ -480,7 +480,7 @@ public class OzoneVolume extends WithMetadata {
@Override
public OzoneBucket next() {
- if(hasNext()) {
+ if (hasNext()) {
currentValue = currentIterator.next();
return currentValue;
}
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntry.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntry.java
index 45e8473..5aff685 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntry.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntry.java
@@ -248,7 +248,7 @@ public class BlockOutputStreamEntry extends OutputStream {
/**
* Increases current position by one. Used in writes.
*/
- void incCurrentPosition(){
+ void incCurrentPosition() {
currentPosition++;
}
@@ -280,7 +280,7 @@ public class BlockOutputStreamEntry extends OutputStream {
this.blockID = id;
}
- OzoneClientConfig getConf(){
+ OzoneClientConfig getConf() {
return this.config;
}
@@ -305,7 +305,7 @@ public class BlockOutputStreamEntry extends OutputStream {
* OMKeyLocationInfo.
* @return
*/
- Pipeline getPipelineForOMLocationReport(){
+ Pipeline getPipelineForOMLocationReport() {
return getPipeline();
}
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/OzoneKMSUtil.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/OzoneKMSUtil.java
index eecc73b..470f695 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/OzoneKMSUtil.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/OzoneKMSUtil.java
@@ -80,7 +80,7 @@ public final class OzoneKMSUtil {
*/
public static Text getKeyProviderMapKey(URI namespaceUri) {
return new Text(O3_KMS_PREFIX + namespaceUri.getScheme()
- +"://" + namespaceUri.getAuthority());
+ + "://" + namespaceUri.getAuthority());
}
public static String bytes2String(byte[] bytes) {
@@ -131,7 +131,7 @@ public final class OzoneKMSUtil {
}
public static KeyProvider getKeyProvider(final ConfigurationSource conf,
- final URI serverProviderUri) throws IOException{
+ final URI serverProviderUri) throws IOException {
if (serverProviderUri == null) {
throw new IOException("KMS serverProviderUri is not configured.");
}
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index b9db113..3280441 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -537,7 +537,7 @@ public class RpcClient implements ClientProtocol {
List<OzoneAcl> listOfAcls = getAclList();
//ACLs from BucketArgs
- if(bucketArgs.getAcls() != null) {
+ if (bucketArgs.getAcls() != null) {
listOfAcls.addAll(bucketArgs.getAcls());
}
@@ -856,7 +856,7 @@ public class RpcClient implements ClientProtocol {
.setAcls(getAclList())
.setLatestVersionLocation(getLatestVersionLocation);
if (Boolean.parseBoolean(metadata.get(OzoneConsts.GDPR_FLAG))) {
- try{
+ try {
GDPRSymmetricKey gKey = new GDPRSymmetricKey(new SecureRandom());
builder.addAllMetadata(gKey.getKeyDetails());
} catch (Exception e) {
@@ -950,13 +950,13 @@ public class RpcClient implements ClientProtocol {
List<OmKeyLocationInfo> keyLocationInfos
= keyInfo.getLatestVersionLocations().getBlocksLatestVersionOnly();
- for(OmKeyLocationInfo keyLocationInfo : keyLocationInfos) {
+ for (OmKeyLocationInfo keyLocationInfo : keyLocationInfos) {
Map<DatanodeDetails, OzoneInputStream> blocks = new HashMap<>();
Pipeline pipelineBefore = keyLocationInfo.getPipeline();
List<DatanodeDetails> datanodes = pipelineBefore.getNodes();
- for(DatanodeDetails dn : datanodes) {
+ for (DatanodeDetails dn : datanodes) {
List<DatanodeDetails> nodes = new ArrayList<>();
nodes.add(dn);
Pipeline pipeline
@@ -1015,7 +1015,7 @@ public class RpcClient implements ClientProtocol {
String fromKeyName, String toKeyName) throws IOException {
verifyVolumeName(volumeName);
verifyBucketName(bucketName);
- if(checkKeyNameEnabled){
+ if (checkKeyNameEnabled) {
HddsClientUtils.verifyKeyName(toKeyName);
}
HddsClientUtils.checkNotNull(fromKeyName, toKeyName);
@@ -1157,13 +1157,13 @@ public class RpcClient implements ClientProtocol {
throws IOException {
verifyVolumeName(volumeName);
verifyBucketName(bucketName);
- if(checkKeyNameEnabled) {
+ if (checkKeyNameEnabled) {
HddsClientUtils.verifyKeyName(keyName);
}
HddsClientUtils.checkNotNull(keyName, uploadID);
- Preconditions.checkArgument(partNumber > 0 && partNumber <=10000, "Part " +
+ Preconditions.checkArgument(partNumber > 0 && partNumber <= 10000, "Part " +
"number should be greater than zero and less than or equal to 10000");
- Preconditions.checkArgument(size >=0, "size should be greater than or " +
+ Preconditions.checkArgument(size >= 0, "size should be greater than or " +
"equal to zero");
String requestId = UUID.randomUUID().toString();
OmKeyArgs keyArgs = new OmKeyArgs.Builder()
@@ -1508,7 +1508,7 @@ public class RpcClient implements ClientProtocol {
final KeyProvider.KeyVersion decrypted = getDEK(feInfo);
List<OzoneCryptoInputStream> cryptoInputStreams = new ArrayList<>();
- for(LengthInputStream lengthInputStream : lengthInputStreams) {
+ for (LengthInputStream lengthInputStream : lengthInputStreams) {
final OzoneCryptoInputStream ozoneCryptoInputStream =
new OzoneCryptoInputStream(lengthInputStream,
OzoneKMSUtil.getCryptoCodec(conf, feInfo),
@@ -1546,11 +1546,11 @@ public class RpcClient implements ClientProtocol {
decrypted.getMaterial(), feInfo.getIV());
return new OzoneOutputStream(cryptoOut);
} else {
- try{
+ try {
GDPRSymmetricKey gk;
Map<String, String> openKeyMetadata =
openKey.getKeyInfo().getMetadata();
- if(Boolean.valueOf(openKeyMetadata.get(OzoneConsts.GDPR_FLAG))){
+ if (Boolean.valueOf(openKeyMetadata.get(OzoneConsts.GDPR_FLAG))) {
gk = new GDPRSymmetricKey(
openKeyMetadata.get(OzoneConsts.GDPR_SECRET),
openKeyMetadata.get(OzoneConsts.GDPR_ALGORITHM)
@@ -1559,7 +1559,7 @@ public class RpcClient implements ClientProtocol {
return new OzoneOutputStream(
new CipherOutputStream(keyOutputStream, gk.getCipher()));
}
- }catch (Exception ex){
+ } catch (Exception ex) {
throw new IOException(ex);
}
diff --git a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestHddsClientUtils.java b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestHddsClientUtils.java
index 712120d..6c047ab 100644
--- a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestHddsClientUtils.java
+++ b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestHddsClientUtils.java
@@ -65,7 +65,7 @@ public class TestHddsClientUtils {
public Timeout timeout = Timeout.seconds(300);
@Rule
- public ExpectedException thrown= ExpectedException.none();
+ public ExpectedException thrown = ExpectedException.none();
/**
* Verify client endpoint lookup failure if it is not configured.
@@ -104,7 +104,7 @@ public class TestHddsClientUtils {
conf.set(ScmConfigKeys.OZONE_SCM_SERVICE_IDS_KEY, scmServiceId);
String[] nodes = new String[] {"scm1", "scm2", "scm3"};
- conf.set(ScmConfigKeys.OZONE_SCM_NODES_KEY+"."+scmServiceId,
+ conf.set(ScmConfigKeys.OZONE_SCM_NODES_KEY + "." + scmServiceId,
"scm1,scm2,scm3");
conf.set(ScmConfigKeys.OZONE_SCM_NODE_ID_KEY, "scm1");
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
index 96c5658..7571f4e 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
@@ -484,7 +484,7 @@ public final class OmUtils {
// If this key is in a GDPR enforced bucket, then before moving
// KeyInfo to deletedTable, remove the GDPR related metadata and
// FileEncryptionInfo from KeyInfo.
- if(Boolean.valueOf(keyInfo.getMetadata().get(OzoneConsts.GDPR_FLAG))) {
+ if (Boolean.valueOf(keyInfo.getMetadata().get(OzoneConsts.GDPR_FLAG))) {
keyInfo.getMetadata().remove(OzoneConsts.GDPR_FLAG);
keyInfo.getMetadata().remove(OzoneConsts.GDPR_ALGORITHM);
keyInfo.getMetadata().remove(OzoneConsts.GDPR_SECRET);
@@ -494,7 +494,7 @@ public final class OmUtils {
// Set the updateID
keyInfo.setUpdateID(trxnLogIndex, isRatisEnabled);
- if(repeatedOmKeyInfo == null) {
+ if (repeatedOmKeyInfo == null) {
//The key doesn't exist in deletedTable, so create a new instance.
repeatedOmKeyInfo = new RepeatedOmKeyInfo(keyInfo);
} else {
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OzoneAcl.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OzoneAcl.java
index 6a74342..7ca0634 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OzoneAcl.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OzoneAcl.java
@@ -105,7 +105,7 @@ public class OzoneAcl {
Objects.requireNonNull(type);
Objects.requireNonNull(acls);
- if(acls.cardinality() > ACLType.getNoOfAcls()) {
+ if (acls.cardinality() > ACLType.getNoOfAcls()) {
throw new IllegalArgumentException("Acl bitset passed has unexpected " +
"size. bitset size:" + acls.cardinality() + ", bitset:"
+ acls.toString());
@@ -159,7 +159,7 @@ public class OzoneAcl {
AclScope aclScope = AclScope.ACCESS;
// Check if acl string contains scope info.
- if(parts[2].matches(ACL_SCOPE_REGEX)) {
+ if (parts[2].matches(ACL_SCOPE_REGEX)) {
int indexOfOpenBracket = parts[2].indexOf("[");
bits = parts[2].substring(0, indexOfOpenBracket);
aclScope = AclScope.valueOf(parts[2].substring(indexOfOpenBracket + 1,
@@ -194,7 +194,7 @@ public class OzoneAcl {
}
List<OzoneAcl> ozAcls = new ArrayList<>();
- for(String acl:parts) {
+ for (String acl:parts) {
ozAcls.add(parseAcl(acl));
}
return ozAcls;
@@ -289,7 +289,7 @@ public class OzoneAcl {
}
public List<ACLType> getAclList() {
- if(aclBitSet != null) {
+ if (aclBitSet != null) {
return aclBitSet.stream().mapToObj(a ->
ACLType.values()[a]).collect(Collectors.toList());
}
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
index e3e7f41..82d26f9 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
@@ -201,15 +201,15 @@ public final class OMConfigKeys {
public static final String DELEGATION_REMOVER_SCAN_INTERVAL_KEY =
"ozone.manager.delegation.remover.scan.interval";
public static final long DELEGATION_REMOVER_SCAN_INTERVAL_DEFAULT =
- 60*60*1000;
+ 60 * 60 * 1000;
public static final String DELEGATION_TOKEN_RENEW_INTERVAL_KEY =
"ozone.manager.delegation.token.renew-interval";
public static final long DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT =
- 24*60*60*1000; // 1 day = 86400000 ms
+ 24 * 60 * 60 * 1000; // 1 day = 86400000 ms
public static final String DELEGATION_TOKEN_MAX_LIFETIME_KEY =
"ozone.manager.delegation.token.max-lifetime";
public static final long DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT =
- 7*24*60*60*1000; // 7 days
+ 7 * 24 * 60 * 60 * 1000; // 7 days
public static final String OZONE_DB_CHECKPOINT_TRANSFER_RATE_KEY =
"ozone.manager.db.checkpoint.transfer.bandwidthPerSec";
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketArgs.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketArgs.java
index 1806a03..9291d33 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketArgs.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketArgs.java
@@ -153,7 +153,7 @@ public final class OmBucketArgs extends WithMetadata implements Auditable {
this.metadata.get(OzoneConsts.GDPR_FLAG));
auditMap.put(OzoneConsts.IS_VERSION_ENABLED,
String.valueOf(this.isVersionEnabled));
- if(this.storageType != null){
+ if (this.storageType != null) {
auditMap.put(OzoneConsts.STORAGE_TYPE, this.storageType.name());
}
if (this.ownerName != null) {
@@ -241,16 +241,16 @@ public final class OmBucketArgs extends WithMetadata implements Auditable {
BucketArgs.Builder builder = BucketArgs.newBuilder();
builder.setVolumeName(volumeName)
.setBucketName(bucketName);
- if(isVersionEnabled != null) {
+ if (isVersionEnabled != null) {
builder.setIsVersionEnabled(isVersionEnabled);
}
- if(storageType != null) {
+ if (storageType != null) {
builder.setStorageType(storageType.toProto());
}
- if(quotaInBytes > 0 || quotaInBytes == OzoneConsts.QUOTA_RESET) {
+ if (quotaInBytes > 0 || quotaInBytes == OzoneConsts.QUOTA_RESET) {
builder.setQuotaInBytes(quotaInBytes);
}
- if(quotaInNamespace > 0 || quotaInNamespace == OzoneConsts.QUOTA_RESET) {
+ if (quotaInNamespace > 0 || quotaInNamespace == OzoneConsts.QUOTA_RESET) {
builder.setQuotaInNamespace(quotaInNamespace);
}
if (ownerName != null) {
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
index d6f2243..485cf32 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
@@ -150,7 +150,7 @@ public final class OmKeyInfo extends WithParentObjectId {
public synchronized OmKeyLocationInfoGroup getLatestVersionLocations() {
- return keyLocationVersions.size() == 0? null :
+ return keyLocationVersions.size() == 0 ? null :
keyLocationVersions.get(keyLocationVersions.size() - 1);
}
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
index 1504f4e..9df7518 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
@@ -225,7 +225,7 @@ public final class OmKeyLocationInfo {
getPipeline(keyLocation),
keyLocation.getLength(),
keyLocation.getOffset(), keyLocation.getPartNumber());
- if(keyLocation.hasToken()) {
+ if (keyLocation.hasToken()) {
info.token = (Token<OzoneBlockTokenIdentifier>)
OzonePBHelper.tokenFromProto(keyLocation.getToken());
}
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfoGroup.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfoGroup.java
index e312138..ec66068 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfoGroup.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfoGroup.java
@@ -165,7 +165,7 @@ public class OmKeyLocationInfoGroup {
}
}
- void removeBlocks(long versionToRemove){
+ void removeBlocks(long versionToRemove) {
locationVersionMap.remove(versionToRemove);
}
@@ -181,7 +181,7 @@ public class OmKeyLocationInfoGroup {
sb.append("version:").append(version).append(" ");
sb.append("isMultipartKey:").append(isMultipartKey);
for (List<OmKeyLocationInfo> kliList : locationVersionMap.values()) {
- for(OmKeyLocationInfo kli: kliList) {
+ for (OmKeyLocationInfo kli: kliList) {
sb.append(kli.getLocalID()).append(" || ");
}
}
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
index 85165d6..91cc19c 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
@@ -94,7 +94,7 @@ public final class OmVolumeArgs extends WithObjectID implements Auditable {
}
public void setQuotaInNamespace(long quotaInNamespace) {
- this.quotaInNamespace= quotaInNamespace;
+ this.quotaInNamespace = quotaInNamespace;
}
public void setCreationTime(long time) {
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneAclUtil.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneAclUtil.java
index 0ca1e36..94dff51 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneAclUtil.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneAclUtil.java
@@ -43,7 +43,7 @@ import static org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType.NON
*/
public final class OzoneAclUtil {
- private OzoneAclUtil(){
+ private OzoneAclUtil() {
}
/**
@@ -60,7 +60,7 @@ public final class OzoneAclUtil {
// User ACL.
listOfAcls.add(new OzoneAcl(USER, userName, userRights, ACCESS));
- if(userGroups != null) {
+ if (userGroups != null) {
// Group ACLs of the User.
Arrays.asList(userGroups).forEach((group) -> listOfAcls.add(
new OzoneAcl(GROUP, group, groupRights, ACCESS)));
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java
index 3f09d4a..1de5934 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java
@@ -31,7 +31,7 @@ import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER;
*/
public final class OzoneFSUtils {
- private OzoneFSUtils() {}
+ private OzoneFSUtils() { }
/**
* Returns string representation of path after removing the leading slash.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
index cde8e39..83a7184 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
@@ -54,7 +54,7 @@ public class RepeatedOmKeyInfo {
public static RepeatedOmKeyInfo getFromProto(RepeatedKeyInfo
repeatedKeyInfo) {
List<OmKeyInfo> list = new ArrayList<>();
- for(KeyInfo k : repeatedKeyInfo.getKeyInfoList()) {
+ for (KeyInfo k : repeatedKeyInfo.getKeyInfoList()) {
list.add(OmKeyInfo.getFromProtobuf(k));
}
return new RepeatedOmKeyInfo.Builder().setOmKeyInfos(list).build();
@@ -67,7 +67,7 @@ public class RepeatedOmKeyInfo {
*/
public RepeatedKeyInfo getProto(boolean compact, int clientVersion) {
List<KeyInfo> list = new ArrayList<>();
- for(OmKeyInfo k : omKeyInfoList) {
+ for (OmKeyInfo k : omKeyInfoList) {
list.add(k.getProtobuf(compact, clientVersion));
}
@@ -82,7 +82,7 @@ public class RepeatedOmKeyInfo {
public static class Builder {
private List<OmKeyInfo> omKeyInfos;
- public Builder(){}
+ public Builder() { }
public Builder setOmKeyInfos(List<OmKeyInfo> infoList) {
this.omKeyInfos = infoList;
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/ServiceInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/ServiceInfo.java
index c6eb5dd..0a8b1d6 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/ServiceInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/ServiceInfo.java
@@ -62,7 +62,7 @@ public final class ServiceInfo {
/**
* Default constructor for JSON deserialization.
*/
- public ServiceInfo() {}
+ public ServiceInfo() { }
/**
* Constructs the ServiceInfo for the {@code nodeType}.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithObjectID.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithObjectID.java
index 6b12f13..eebb4d87 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithObjectID.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/WithObjectID.java
@@ -61,7 +61,7 @@ public class WithObjectID extends WithMetadata {
* @param obId - long
*/
public void setObjectID(long obId) {
- if(this.objectID != 0) {
+ if (this.objectID != 0) {
throw new UnsupportedOperationException("Attempt to modify object ID " +
"which is not zero. Current Object ID is " + this.objectID);
}
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
index e2bf9f0..be758a0 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
@@ -603,7 +603,7 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
.setBucketName(args.getBucketName())
.setKeyName(args.getKeyName());
- if(args.getAcls() != null) {
+ if (args.getAcls() != null) {
keyArgs.addAllAcls(args.getAcls().stream().distinct().map(a ->
OzoneAcl.toProtobuf(a)).collect(Collectors.toList()));
}
@@ -1231,7 +1231,7 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
OMPBHelper.convertToDelegationToken(resp.getResponse().getToken())
: null;
} catch (IOException e) {
- if(e instanceof OMException) {
+ if (e instanceof OMException) {
throw (OMException)e;
}
throw new OMException("Get delegation token failed.", e,
@@ -1263,7 +1263,7 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
.getRenewDelegationTokenResponse();
return resp.getResponse().getNewExpiryTime();
} catch (IOException e) {
- if(e instanceof OMException) {
+ if (e instanceof OMException) {
throw (OMException)e;
}
throw new OMException("Renew delegation token failed.", e,
@@ -1292,7 +1292,7 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
try {
handleError(submitRequest(omRequest));
} catch (IOException e) {
- if(e instanceof OMException) {
+ if (e instanceof OMException) {
throw (OMException)e;
}
throw new OMException("Cancel delegation token failed.", e,
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/protocolPB/OMPBHelper.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/protocolPB/OMPBHelper.java
index 2ff2dc8..51c7d54 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/protocolPB/OMPBHelper.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/protocolPB/OMPBHelper.java
@@ -50,7 +50,7 @@ public final class OMPBHelper {
* @return tokenProto
*/
public static TokenProto convertToTokenProto(Token<?> tok) {
- if(tok == null){
+ if (tok == null) {
throw new IllegalArgumentException("Invalid argument: token is null");
}
@@ -86,9 +86,9 @@ public final class OMPBHelper {
}
return new BucketEncryptionKeyInfo(
- beInfo.hasCryptoProtocolVersion()?
+ beInfo.hasCryptoProtocolVersion() ?
convert(beInfo.getCryptoProtocolVersion()) : null,
- beInfo.hasSuite()? convert(beInfo.getSuite()) : null,
+ beInfo.hasSuite() ? convert(beInfo.getSuite()) : null,
beInfo.getKeyName());
}
@@ -106,7 +106,7 @@ public final class OMPBHelper {
if (beInfo.getSuite() != null) {
bb.setSuite(convert(beInfo.getSuite()));
}
- if (beInfo.getVersion()!= null) {
+ if (beInfo.getVersion() != null) {
bb.setCryptoProtocolVersion(convert(beInfo.getVersion()));
}
return bb.build();
@@ -142,7 +142,7 @@ public final class OMPBHelper {
}
public static CipherSuite convert(CipherSuiteProto proto) {
- switch(proto) {
+ switch (proto) {
case AES_CTR_NOPADDING:
return CipherSuite.AES_CTR_NOPADDING;
default:
@@ -166,7 +166,7 @@ public final class OMPBHelper {
public static CryptoProtocolVersionProto convert(
CryptoProtocolVersion version) {
- switch(version) {
+ switch (version) {
case UNKNOWN:
return OzoneManagerProtocolProtos.CryptoProtocolVersionProto
.UNKNOWN_PROTOCOL_VERSION;
@@ -180,7 +180,7 @@ public final class OMPBHelper {
public static CryptoProtocolVersion convert(
CryptoProtocolVersionProto proto) {
- switch(proto) {
+ switch (proto) {
case ENCRYPTION_ZONES:
return CryptoProtocolVersion.ENCRYPTION_ZONES;
default:
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObjInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObjInfo.java
index 76fb76a..09c8743 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObjInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObjInfo.java
@@ -111,7 +111,7 @@ public final class OzoneObjInfo extends OzoneObj {
.setStoreType(StoreType.valueOf(proto.getStoreType().name()));
String[] tokens = StringUtils.split(proto.getPath(),
OZONE_URI_DELIMITER, 3);
- if(tokens == null) {
+ if (tokens == null) {
throw new IllegalArgumentException("Unexpected path:" + proto.getPath());
}
// Set volume name.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java
index 0b1b787..85e452e 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java
@@ -44,7 +44,7 @@ public final class OzoneVersionInfo {
public static final RatisVersionInfo RATIS_VERSION_INFO =
new RatisVersionInfo();
- private OzoneVersionInfo() {}
+ private OzoneVersionInfo() { }
public static void main(String[] args) {
System.out.println(
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixTree.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixTree.java
index d7794db..0f85973 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixTree.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixTree.java
@@ -129,7 +129,7 @@ public class RadixTree<T> {
return false;
}
- if (removePrefixPathInternal(node, path, level+1)) {
+ if (removePrefixPathInternal(node, path, level + 1)) {
current.getChildren().remove(name);
return current.hasChildren();
}
diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMFailoverProxyProvider.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMFailoverProxyProvider.java
index 12b0d40..052ff8f 100644
--- a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMFailoverProxyProvider.java
+++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMFailoverProxyProvider.java
@@ -180,7 +180,7 @@ public class TestOMFailoverProxyProvider {
String nodeId = NODE_ID_BASE_STR + i;
ozoneConf.set(
ConfUtils.addKeySuffixes(OZONE_OM_ADDRESS_KEY, OM_SERVICE_ID,
- nodeId), nodeAddrs.get(i-1));
+ nodeId), nodeAddrs.get(i - 1));
allNodeIds.add(nodeId);
}
ozoneConf.set(ConfUtils.addKeySuffixes(OZONE_OM_NODES_KEY, OM_SERVICE_ID),
diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
index 16285c2..de12e79 100644
--- a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
+++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
@@ -70,7 +70,7 @@ public class TestOzoneManagerLock {
// Lock re-acquire not allowed by same thread.
if (resource == OzoneManagerLock.Resource.USER_LOCK ||
resource == OzoneManagerLock.Resource.S3_SECRET_LOCK ||
- resource == OzoneManagerLock.Resource.PREFIX_LOCK){
+ resource == OzoneManagerLock.Resource.PREFIX_LOCK) {
lock.acquireWriteLock(resource, resourceName);
try {
lock.acquireWriteLock(resource, resourceName);
diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestGDPRSymmetricKey.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestGDPRSymmetricKey.java
index 39c6220..1ddf353 100644
--- a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestGDPRSymmetricKey.java
+++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestGDPRSymmetricKey.java
@@ -55,7 +55,7 @@ public class TestGDPRSymmetricKey {
@Test
public void testKeyGenerationWithInvalidInput() throws Exception {
GDPRSymmetricKey gkey = null;
- try{
+ try {
gkey = new GDPRSymmetricKey(RandomStringUtils.randomAlphabetic(5),
OzoneConsts.GDPR_ALGORITHM_NAME);
} catch (IllegalArgumentException ex) {
diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObjInfo.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObjInfo.java
index ab24b1b..2db0dbb 100644
--- a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObjInfo.java
+++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneObjInfo.java
@@ -67,10 +67,10 @@ public class TestOzoneObjInfo {
objInfo = getBuilder(volume, bucket, key).build();
assertEquals(objInfo.getBucketName(), bucket);
- objInfo =getBuilder(volume, null, null).build();
+ objInfo = getBuilder(volume, null, null).build();
assertEquals(objInfo.getBucketName(), null);
- objInfo =getBuilder(null, bucket, null).build();
+ objInfo = getBuilder(null, bucket, null).build();
assertEquals(objInfo.getBucketName(), bucket);
}
diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/util/TestRadixTree.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/util/TestRadixTree.java
index b97b844..817885e 100644
--- a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/util/TestRadixTree.java
+++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/util/TestRadixTree.java
@@ -80,13 +80,13 @@ public class TestRadixTree {
public void testGetLongestPrefixPath() {
List<RadixNode<Integer>> lpp =
ROOT.getLongestPrefixPath("/a/b/c/d/g/p");
- RadixNode<Integer> lpn = lpp.get(lpp.size()-1);
+ RadixNode<Integer> lpn = lpp.get(lpp.size() - 1);
assertEquals("g", lpn.getName());
lpn.setValue(100);
List<RadixNode<Integer>> lpq =
ROOT.getLongestPrefixPath("/a/b/c/d/g/q");
- RadixNode<Integer> lqn = lpp.get(lpq.size()-1);
+ RadixNode<Integer> lqn = lpp.get(lpq.size() - 1);
System.out.print(RadixTree.radixPathToString(lpq));
assertEquals(lpn, lqn);
assertEquals("g", lqn.getName());
diff --git a/hadoop-ozone/dev-support/checks/checkstyle.sh b/hadoop-ozone/dev-support/checks/checkstyle.sh
index e76a67a..bd5e7f0 100755
--- a/hadoop-ozone/dev-support/checks/checkstyle.sh
+++ b/hadoop-ozone/dev-support/checks/checkstyle.sh
@@ -44,6 +44,9 @@ find "." -name checkstyle-errors.xml -print0 \
-e 's/<file name="\([^"]*\)".*/\1/' \
-e 's/<error.*line="\([[:digit:]]*\)".*message="\([^"]*\)".*/ \1: \2/' \
-e "s!^${BASE_DIR}/!!" \
+ -e "s/'/'/g" \
+ -e "s/</</g" \
+ -e "s/>/>/g" \
| tee "$REPORT_FILE"
## generate counter
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
index 05094b0..b6ef865 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
@@ -229,7 +229,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
protected void initializeConfiguration() throws IOException {
super.initializeConfiguration();
- OzoneClientConfig clientConfig =new OzoneClientConfig();
+ OzoneClientConfig clientConfig = new OzoneClientConfig();
clientConfig.setStreamBufferFlushSize(8 * 1024 * 1024);
clientConfig.setStreamBufferMaxSize(16 * 1024 * 1024);
clientConfig.setStreamBufferSize(4 * 1024);
@@ -331,7 +331,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
public Set<OzoneManager> omToFail() {
int numNodesToFail = getNumberOfOmToFail();
- if (failedOmSet.size() >= numOzoneManagers/2) {
+ if (failedOmSet.size() >= numOzoneManagers / 2) {
return Collections.emptySet();
}
@@ -359,7 +359,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
// Should the selected node be stopped or started.
public boolean shouldStopOm() {
- if (failedOmSet.size() >= numOzoneManagers/2) {
+ if (failedOmSet.size() >= numOzoneManagers / 2) {
return false;
}
return RandomUtils.nextBoolean();
@@ -407,7 +407,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
public Set<StorageContainerManager> scmToFail() {
int numNodesToFail = getNumberOfScmToFail();
- if (failedScmSet.size() >= numStorageContainerManagers/2) {
+ if (failedScmSet.size() >= numStorageContainerManagers / 2) {
return Collections.emptySet();
}
@@ -434,7 +434,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
// Should the selected node be stopped or started.
public boolean shouldStopScm() {
- if (failedScmSet.size() >= numStorageContainerManagers/2) {
+ if (failedScmSet.size() >= numStorageContainerManagers / 2) {
return false;
}
return RandomUtils.nextBoolean();
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneLoadGenerator.java b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneLoadGenerator.java
index 7e78e0f..f9c7fd0 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneLoadGenerator.java
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneLoadGenerator.java
@@ -58,7 +58,7 @@ public class MiniOzoneLoadGenerator {
this.conf = conf;
this.omServiceID = omServiceId;
- for(Class<? extends LoadGenerator> clazz : loadGeneratorClazzes) {
+ for (Class<? extends LoadGenerator> clazz : loadGeneratorClazzes) {
addLoads(clazz, buffer);
}
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/LoadBucket.java b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/LoadBucket.java
index c6ccb3a..4a380fe 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/LoadBucket.java
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/LoadBucket.java
@@ -195,7 +195,7 @@ public class LoadBucket {
@Override
public String toString() {
return super.toString() + " "
- + (readDir ? "readDirectory": "writeDirectory");
+ + (readDir ? "readDirectory" : "writeDirectory");
}
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java
index dc86044..752962f 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java
@@ -177,7 +177,7 @@ public class TestOzoneFSWithObjectStoreCreate {
keys.add("/dir1/dir2");
keys.add("/dir1/dir2/dir3");
keys.add("/dir1/dir2/dir3/dir4/");
- for (int i=1; i <= 3; i++) {
+ for (int i = 1; i <= 3; i++) {
int length = 10;
String fileName = parentDir.concat("/file" + i + "/");
keys.add(fileName);
@@ -190,7 +190,7 @@ public class TestOzoneFSWithObjectStoreCreate {
}
// check
- for (int i=1; i <= 3; i++) {
+ for (int i = 1; i <= 3; i++) {
String fileName = parentDir.concat("/file" + i + "/");
Path p = new Path(fileName);
Assert.assertTrue(o3fs.getFileStatus(p).isFile());
@@ -209,12 +209,12 @@ public class TestOzoneFSWithObjectStoreCreate {
Assert.assertTrue(result);
// No Key should exist.
- for(String key : keys) {
+ for (String key : keys) {
checkPath(new Path(key));
}
- for (int i=1; i <= 3; i++) {
+ for (int i = 1; i <= 3; i++) {
int length = 10;
String fileName = parentDir.concat("/file" + i + "/");
OzoneOutputStream ozoneOutputStream =
@@ -229,12 +229,12 @@ public class TestOzoneFSWithObjectStoreCreate {
o3fs.rename(new Path("/dir1"), new Path("/dest"));
// No source Key should exist.
- for(String key : keys) {
+ for (String key : keys) {
checkPath(new Path(key));
}
// check dest path.
- for (int i=1; i <= 3; i++) {
+ for (int i = 1; i <= 3; i++) {
String fileName = "/dest/".concat(parentDir.concat("/file" + i + "/"));
Path p = new Path(fileName);
Assert.assertTrue(o3fs.getFileStatus(p).isFile());
@@ -467,7 +467,7 @@ public class TestOzoneFSWithObjectStoreCreate {
private void checkAncestors(Path p) throws Exception {
p = p.getParent();
- while(p.getParent() != null) {
+ while (p.getParent() != null) {
FileStatus fileStatus = o3fs.getFileStatus(p);
Assert.assertTrue(fileStatus.isDirectory());
p = p.getParent();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java
index 0e9c360..5c2e0cf 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java
@@ -523,7 +523,7 @@ public class TestOzoneFileInterfaces {
assertEquals(0, blockLocations[0].getOffset());
assertEquals(blockSize, blockLocations[1].getOffset());
- assertEquals(2*blockSize, blockLocations[2].getOffset());
+ assertEquals(2 * blockSize, blockLocations[2].getOffset());
assertEquals(blockSize, blockLocations[0].getLength());
assertEquals(blockSize, blockLocations[1].getLength());
assertEquals(837, blockLocations[2].getLength());
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
index 8bd4ea6..5393ffd 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
@@ -207,7 +207,7 @@ public class TestOzoneFileSystem {
for (FileStatus fileStatus : fileStatuses) {
fs.delete(fileStatus.getPath(), true);
}
- } catch (IOException ex){
+ } catch (IOException ex) {
fail("Failed to cleanup files.");
}
}
@@ -260,7 +260,7 @@ public class TestOzoneFileSystem {
fs.mkdirs(dir1);
try (FSDataOutputStream outputStream1 = fs.create(dir1, false)) {
fail("Should throw FileAlreadyExistsException");
- } catch (FileAlreadyExistsException fae){
+ } catch (FileAlreadyExistsException fae) {
// ignore as its expected
}
@@ -291,14 +291,14 @@ public class TestOzoneFileSystem {
fileStatus.isDirectory());
// invalid sub directory
- try{
+ try {
fs.getFileStatus(new Path("/d1/d2/d3/d4/key3/invalid"));
fail("Should throw FileNotFoundException");
} catch (FileNotFoundException fnfe) {
// ignore as its expected
}
// invalid file name
- try{
+ try {
fs.getFileStatus(new Path("/d1/d2/d3/d4/invalidkey"));
fail("Should throw FileNotFoundException");
} catch (FileNotFoundException fnfe) {
@@ -345,10 +345,10 @@ public class TestOzoneFileSystem {
}
private void checkInvalidPath(Path path) throws Exception {
- try{
+ try {
LambdaTestUtils.intercept(InvalidPathException.class, "Invalid path Name",
() -> fs.create(path, false));
- } catch (AssertionError e){
+ } catch (AssertionError e) {
fail("testCreateWithInvalidPaths failed for path" + path);
}
}
@@ -417,7 +417,7 @@ public class TestOzoneFileSystem {
Path grandparent = new Path("/gdir1");
for (int i = 1; i <= 10; i++) {
- Path parent = new Path(grandparent, "pdir" +i);
+ Path parent = new Path(grandparent, "pdir" + i);
Path child = new Path(parent, "child");
ContractTestUtils.touch(fs, child);
}
@@ -446,7 +446,7 @@ public class TestOzoneFileSystem {
checkPath(grandparent);
for (int i = 1; i <= 10; i++) {
- Path parent = new Path(grandparent, "dir" +i);
+ Path parent = new Path(grandparent, "dir" + i);
Path child = new Path(parent, "child");
checkPath(parent);
checkPath(child);
@@ -456,8 +456,8 @@ public class TestOzoneFileSystem {
Path level0 = new Path("/level0");
for (int i = 1; i <= 3; i++) {
- Path level1 = new Path(level0, "level" +i);
- Path level2 = new Path(level1, "level" +i);
+ Path level1 = new Path(level0, "level" + i);
+ Path level2 = new Path(level1, "level" + i);
Path level1File = new Path(level1, "file1");
Path level2File = new Path(level2, "file1");
ContractTestUtils.touch(fs, level1File);
@@ -466,8 +466,8 @@ public class TestOzoneFileSystem {
// Delete at sub directory level.
for (int i = 1; i <= 3; i++) {
- Path level1 = new Path(level0, "level" +i);
- Path level2 = new Path(level1, "level" +i);
+ Path level1 = new Path(level0, "level" + i);
+ Path level2 = new Path(level1, "level" + i);
fs.delete(level2, true);
fs.delete(level1, true);
}
@@ -480,8 +480,8 @@ public class TestOzoneFileSystem {
checkPath(level0);
for (int i = 1; i <= 3; i++) {
- Path level1 = new Path(level0, "level" +i);
- Path level2 = new Path(level1, "level" +i);
+ Path level1 = new Path(level0, "level" + i);
+ Path level2 = new Path(level1, "level" + i);
Path level1File = new Path(level1, "file1");
Path level2File = new Path(level2, "file1");
checkPath(level1);
@@ -591,9 +591,9 @@ public class TestOzoneFileSystem {
// Wait until the filestatus is updated
if (!enabledFileSystemPaths) {
- GenericTestUtils.waitFor(()-> {
+ GenericTestUtils.waitFor(() -> {
try {
- return fs.listStatus(parent).length!=0;
+ return fs.listStatus(parent).length != 0;
} catch (IOException e) {
LOG.error("listStatus() Failed", e);
Assert.fail("listStatus() Failed");
@@ -644,7 +644,7 @@ public class TestOzoneFileSystem {
deleteRootDir(); // cleanup
Set<String> paths = new TreeSet<>();
int numDirs = LISTING_PAGE_SIZE + LISTING_PAGE_SIZE / 2;
- for(int i = 0; i < numDirs; i++) {
+ for (int i = 0; i < numDirs; i++) {
Path p = new Path(root, String.valueOf(i));
fs.mkdirs(p);
paths.add(p.getName());
@@ -677,7 +677,7 @@ public class TestOzoneFileSystem {
"Total directories listed do not match the existing directories",
numDirs, fileStatuses.length);
- for (int i=0; i < numDirs; i++) {
+ for (int i = 0; i < numDirs; i++) {
assertTrue(paths.contains(fileStatuses[i].getPath().getName()));
}
}
@@ -1278,7 +1278,7 @@ public class TestOzoneFileSystem {
Path trashPath = new Path(userTrashCurrent, testKeyName);
// Wait until the TrashEmptier purges the key
- GenericTestUtils.waitFor(()-> {
+ GenericTestUtils.waitFor(() -> {
try {
return !o3fs.exists(trashPath);
} catch (IOException e) {
@@ -1292,9 +1292,9 @@ public class TestOzoneFileSystem {
Assert.assertEquals(1, fs.listStatus(userTrash).length);
// wait for deletion of checkpoint dir
- GenericTestUtils.waitFor(()-> {
+ GenericTestUtils.waitFor(() -> {
try {
- return o3fs.listStatus(userTrash).length==0;
+ return o3fs.listStatus(userTrash).length == 0;
} catch (IOException e) {
LOG.error("Delete from Trash Failed", e);
Assert.fail("Delete from Trash Failed");
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java
index 974912a..4153962 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java
@@ -188,7 +188,7 @@ public class TestOzoneFsHAURLs {
*/
private String getHostFromAddress(String addr) {
Optional<String> hostOptional = getHostName(addr);
- assert(hostOptional.isPresent());
+ assert (hostOptional.isPresent());
return hostOptional.get();
}
@@ -199,7 +199,7 @@ public class TestOzoneFsHAURLs {
*/
private int getPortFromAddress(String addr) {
OptionalInt portOptional = getHostPort(addr);
- assert(portOptional.isPresent());
+ assert (portOptional.isPresent());
return portOptional.getAsInt();
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
index 96b461f..de73161 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
@@ -191,7 +191,7 @@ public class TestRootedOzoneFileSystem {
conf = new OzoneConfiguration();
conf.setFloat(OMConfigKeys.OZONE_FS_TRASH_INTERVAL_KEY, TRASH_INTERVAL);
conf.setFloat(FS_TRASH_INTERVAL_KEY, TRASH_INTERVAL);
- conf.setFloat(FS_TRASH_CHECKPOINT_INTERVAL_KEY, TRASH_INTERVAL/2);
+ conf.setFloat(FS_TRASH_CHECKPOINT_INTERVAL_KEY, TRASH_INTERVAL / 2);
conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
if (isBucketFSOptimized) {
bucketLayout = BucketLayout.FILE_SYSTEM_OPTIMIZED;
@@ -546,7 +546,7 @@ public class TestRootedOzoneFileSystem {
Path root = new Path("/" + volumeName + "/" + bucketName);
Set<String> paths = new TreeSet<>();
int numDirs = LISTING_PAGE_SIZE + LISTING_PAGE_SIZE / 2;
- for(int i = 0; i < numDirs; i++) {
+ for (int i = 0; i < numDirs; i++) {
Path p = new Path(root, String.valueOf(i));
fs.mkdirs(p);
paths.add(p.getName());
@@ -557,12 +557,12 @@ public class TestRootedOzoneFileSystem {
"Total directories listed do not match the existing directories",
numDirs, fileStatuses.length);
- for (int i=0; i < numDirs; i++) {
+ for (int i = 0; i < numDirs; i++) {
Assert.assertTrue(paths.contains(fileStatuses[i].getPath().getName()));
}
// Cleanup
- for(int i = 0; i < numDirs; i++) {
+ for (int i = 0; i < numDirs; i++) {
Path p = new Path(root, String.valueOf(i));
fs.delete(p, true);
}
@@ -1362,7 +1362,7 @@ public class TestRootedOzoneFileSystem {
// Wait until the TrashEmptier purges the keys
- GenericTestUtils.waitFor(()-> {
+ GenericTestUtils.waitFor(() -> {
try {
return !ofs.exists(trashPath) && !ofs.exists(trashPath2);
} catch (IOException e) {
@@ -1372,7 +1372,7 @@ public class TestRootedOzoneFileSystem {
}
}, 1000, 180000);
- if (isBucketFSOptimized){
+ if (isBucketFSOptimized) {
Assert.assertTrue(getOMMetrics()
.getNumTrashAtomicDirRenames() > prevNumTrashAtomicDirRenames);
} else {
@@ -1385,10 +1385,10 @@ public class TestRootedOzoneFileSystem {
}
// wait for deletion of checkpoint dir
- GenericTestUtils.waitFor(()-> {
+ GenericTestUtils.waitFor(() -> {
try {
- return ofs.listStatus(userTrash).length==0 &&
- ofs.listStatus(userTrash2).length==0;
+ return ofs.listStatus(userTrash).length == 0 &&
+ ofs.listStatus(userTrash2).length == 0;
} catch (IOException e) {
LOG.error("Delete from Trash Failed", e);
Assert.fail("Delete from Trash Failed");
@@ -1397,7 +1397,7 @@ public class TestRootedOzoneFileSystem {
}, 1000, 120000);
// This condition should succeed once the checkpoint directory is deleted
- if(isBucketFSOptimized){
+ if (isBucketFSOptimized) {
GenericTestUtils.waitFor(
() -> getOMMetrics().getNumTrashAtomicDirDeletes() >
prevNumTrashAtomicDirDeletes, 100, 180000);
@@ -1444,7 +1444,7 @@ public class TestRootedOzoneFileSystem {
@Test
public void testRenameFile() throws Exception {
final String dir = "/dir" + new Random().nextInt(1000);
- Path dirPath = new Path(getBucketPath() +dir);
+ Path dirPath = new Path(getBucketPath() + dir);
getFs().mkdirs(dirPath);
Path file1Source = new Path(getBucketPath() + dir
@@ -1466,7 +1466,7 @@ public class TestRootedOzoneFileSystem {
@Test
public void testRenameFileToDir() throws Exception {
final String dir = "/dir" + new Random().nextInt(1000);
- Path dirPath = new Path(getBucketPath() +dir);
+ Path dirPath = new Path(getBucketPath() + dir);
getFs().mkdirs(dirPath);
Path file1Destin = new Path(getBucketPath() + dir + "/file1");
@@ -1531,11 +1531,11 @@ public class TestRootedOzoneFileSystem {
final Path sourceRoot = new Path(getBucketPath() + root);
LOG.info("Rename op-> source:{} to destin:{}", sourceRoot, subDir1);
// rename should fail and return false
- try{
+ try {
getFs().rename(sourceRoot, subDir1);
fail("Should throw exception : Cannot rename a directory to" +
" its own subdirectory");
- } catch (IllegalArgumentException e){
+ } catch (IllegalArgumentException e) {
//expected
}
}
@@ -1560,7 +1560,7 @@ public class TestRootedOzoneFileSystem {
try {
getFs().rename(dir2SourcePath, destinPath);
fail("Should fail as parent of dst does not exist!");
- } catch (FileNotFoundException fnfe){
+ } catch (FileNotFoundException fnfe) {
//expected
}
// (b) parent of dst is a file. /root_dir/file1/c
@@ -1568,10 +1568,10 @@ public class TestRootedOzoneFileSystem {
ContractTestUtils.touch(getFs(), filePath);
Path newDestinPath = new Path(filePath, "c");
// rename shouldthrow exception
- try{
+ try {
getFs().rename(dir2SourcePath, newDestinPath);
fail("Should fail as parent of dst is a file!");
- } catch (IOException e){
+ } catch (IOException e) {
//expected
}
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractUtils.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractUtils.java
index 0fc23c3..f7858d1 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractUtils.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/ITestOzoneContractUtils.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
public final class ITestOzoneContractUtils {
- private ITestOzoneContractUtils(){}
+ private ITestOzoneContractUtils() { }
private static List<Object> fsoCombinations = Arrays.asList(new Object[] {
// FSO configuration is a cluster level server side configuration.
@@ -47,7 +47,7 @@ public final class ITestOzoneContractUtils {
// and old buckets will be operated on
});
- static List<Object> getFsoCombinations(){
+ static List<Object> getFsoCombinations() {
return fsoCombinations;
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java
index f6c9a25..784897a 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java
@@ -66,7 +66,7 @@ class OzoneContract extends AbstractFSContract {
return path;
}
- public static void initOzoneConfiguration(boolean fsoServer){
+ public static void initOzoneConfiguration(boolean fsoServer) {
fsOptimizedServer = fsoServer;
}
@@ -92,7 +92,7 @@ class OzoneContract extends AbstractFSContract {
conf.addResource(CONTRACT_XML);
- if (fsOptimizedServer){
+ if (fsOptimizedServer) {
// Default bucket layout is set to FSO in case of FSO server.
conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
OMConfigKeys.OZONE_BUCKET_LAYOUT_FILE_SYSTEM_OPTIMIZED);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java
index d741117..c1bbcf4 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java
@@ -59,7 +59,7 @@ public class TestLeaderChoosePolicy {
cluster = MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(numDatanodes)
- .setTotalPipelineNumLimit(numDatanodes + numDatanodes/3)
+ .setTotalPipelineNumLimit(numDatanodes + numDatanodes / 3)
.setHbInterval(2000)
.setHbProcessorInterval(1000)
.build();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
index 4ebcab1..b4d7270 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
@@ -154,7 +154,7 @@ public class TestMultiRaftSetup {
shutdown();
}
private void assertNotSamePeers() {
- nodeManager.getAllNodes().forEach((dn) ->{
+ nodeManager.getAllNodes().forEach((dn) -> {
Collection<DatanodeDetails> peers = nodeManager.getPeerList(dn);
Assert.assertFalse(peers.contains(dn));
List<DatanodeDetails> trimList = nodeManager.getAllNodes();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java
index 58c0c62..457e12a 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java
@@ -61,7 +61,7 @@ public class TestRatisPipelineCreateAndDestroy {
cluster = MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(numDatanodes)
- .setTotalPipelineNumLimit(numDatanodes + numDatanodes/3)
+ .setTotalPipelineNumLimit(numDatanodes + numDatanodes / 3)
.setHbInterval(2000)
.setHbProcessorInterval(1000)
.build();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeWithPipelineRules.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeWithPipelineRules.java
index 724d34c..4c97b51 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeWithPipelineRules.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeWithPipelineRules.java
@@ -86,10 +86,10 @@ public class TestSCMSafeModeWithPipelineRules {
int datanodeCount = 6;
setup(datanodeCount);
- waitForRatis3NodePipelines(datanodeCount/3);
+ waitForRatis3NodePipelines(datanodeCount / 3);
waitForRatis1NodePipelines(datanodeCount);
- int totalPipelineCount = datanodeCount + (datanodeCount/3);
+ int totalPipelineCount = datanodeCount + (datanodeCount / 3);
//Cluster is started successfully
cluster.stop();
@@ -178,7 +178,7 @@ public class TestSCMSafeModeWithPipelineRules {
});
waitForRatis1NodePipelines(datanodeCount);
- waitForRatis3NodePipelines(datanodeCount/3);
+ waitForRatis3NodePipelines(datanodeCount / 3);
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
index e7f6f34..800992d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
@@ -189,7 +189,7 @@ public class TestHDDSUpgrade {
* Some tests repeatedly modify the cluster. Helper function to reload the
* latest SCM state.
*/
- private void loadSCMState(){
+ private void loadSCMState() {
scm = cluster.getStorageContainerManager();
scmContainerManager = scm.getContainerManager();
scmPipelineManager = scm.getPipelineManager();
@@ -503,7 +503,7 @@ public class TestHDDSUpgrade {
IOException {
// For some tests this could get called in a different thread context.
// We need to guard concurrent updates to the cluster.
- synchronized(cluster) {
+ synchronized (cluster) {
cluster.restartStorageContainerManager(true);
loadSCMState();
}
@@ -1090,7 +1090,7 @@ public class TestHDDSUpgrade {
// Verify that new pipeline can be created with upgraded datanodes.
try {
testPostUpgradePipelineCreation();
- } catch(SCMException e) {
+ } catch (SCMException e) {
// If pipeline creation fails, make sure that there is a valid reason
// for this i.e. all datanodes are already part of some pipeline.
for (HddsDatanodeService dataNode : cluster.getHddsDatanodes()) {
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
index 6e56a4d..919b9b2 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
@@ -677,7 +677,7 @@ public class MiniOzoneClusterImpl implements MiniOzoneCluster {
// In this way safemode exit will happen only when atleast we have one
// pipeline.
conf.setInt(HddsConfigKeys.HDDS_SCM_SAFEMODE_MIN_DATANODE,
- numOfDatanodes >=3 ? 3 : 1);
+ numOfDatanodes >= 3 ? 3 : 1);
configureTrace();
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterProvider.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterProvider.java
index 8904620..ab2405a 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterProvider.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterProvider.java
@@ -189,7 +189,7 @@ public class MiniOzoneClusterProvider {
private Thread reapClusters() {
Thread t = new Thread(() -> {
- while(!shutdown || !expiredClusters.isEmpty()) {
+ while (!shutdown || !expiredClusters.isEmpty()) {
try {
// Why not just call take and wait forever until interrupt is
// thrown? Inside MiniCluster.shutdown, there are places where it
@@ -251,7 +251,7 @@ public class MiniOzoneClusterProvider {
}
private void destroyRemainingClusters() {
- while(!clusters.isEmpty()) {
+ while (!clusters.isEmpty()) {
try {
MiniOzoneCluster cluster = clusters.poll();
if (cluster != null) {
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
index 440f5ca..556af06 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
@@ -490,7 +490,7 @@ public class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
try {
initOMHAConfig();
- for (int i = 1; i<= numOfOMs; i++) {
+ for (int i = 1; i <= numOfOMs; i++) {
// Set nodeId
String nodeId = OM_NODE_ID_PREFIX + i;
OzoneConfiguration config = new OzoneConfiguration(conf);
@@ -564,7 +564,7 @@ public class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
try {
initSCMHAConfig();
- for (int i = 1; i<= numOfSCMs; i++) {
+ for (int i = 1; i <= numOfSCMs; i++) {
// Set nodeId
String nodeId = SCM_NODE_ID_PREFIX + i;
String metaDirPath = path + "/" + nodeId;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/OzoneTestUtils.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/OzoneTestUtils.java
index e4cb1a1..dba9739 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/OzoneTestUtils.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/OzoneTestUtils.java
@@ -129,7 +129,7 @@ public final class OzoneTestUtils {
*/
public static void performOperationOnKeyContainers(
CheckedConsumer<BlockID, Exception> consumer,
- List<OmKeyLocationInfoGroup> omKeyLocationInfoGroups) throws Exception{
+ List<OmKeyLocationInfoGroup> omKeyLocationInfoGroups) throws Exception {
for (OmKeyLocationInfoGroup omKeyLocationInfoGroup :
omKeyLocationInfoGroups) {
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerBalancerOperations.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerBalancerOperations.java
index 2b0dfc2..8663c72 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerBalancerOperations.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerBalancerOperations.java
@@ -64,7 +64,7 @@ public class TestContainerBalancerOperations {
@AfterClass
public static void cleanup() throws Exception {
- if(cluster != null) {
+ if (cluster != null) {
cluster.shutdown();
}
}
@@ -100,7 +100,7 @@ public class TestContainerBalancerOperations {
// modify this after balancer is fully completed
try {
Thread.sleep(100);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) { }
running = containerBalancerClient.getContainerBalancerStatus();
assertFalse(running);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerOperations.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerOperations.java
index 5516468..e15d7b1 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerOperations.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerOperations.java
@@ -64,7 +64,7 @@ public class TestContainerOperations {
@AfterClass
public static void cleanup() throws Exception {
- if(cluster != null) {
+ if (cluster != null) {
cluster.shutdown();
}
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
index e7436e0..2b09514 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java
@@ -119,7 +119,7 @@ public class TestMiniOzoneCluster {
cluster.waitForClusterToBeReady();
List<HddsDatanodeService> datanodes = cluster.getHddsDatanodes();
assertEquals(numberOfNodes, datanodes.size());
- for(HddsDatanodeService dn : datanodes) {
+ for (HddsDatanodeService dn : datanodes) {
// Create a single member pipe line
List<DatanodeDetails> dns = new ArrayList<>();
dns.add(dn.getDatanodeDetails());
@@ -132,7 +132,7 @@ public class TestMiniOzoneCluster {
.build();
// Verify client is able to connect to the container
- try (XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf)){
+ try (XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf)) {
client.connect();
assertTrue(client.isConnected(pipeline.getFirstNode()));
}
@@ -285,7 +285,7 @@ public class TestMiniOzoneCluster {
}
private void createMalformedIDFile(File malformedFile)
- throws IOException{
+ throws IOException {
malformedFile.delete();
DatanodeDetails id = randomDatanodeDetails();
ContainerUtils.writeDatanodeDetailsTo(id, malformedFile);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
index 494f74c..e74a98b 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
@@ -138,7 +138,7 @@ public final class TestSecureOzoneCluster {
public Timeout timeout = Timeout.seconds(80);
@Rule
- public TemporaryFolder folder= new TemporaryFolder();
+ public TemporaryFolder folder = new TemporaryFolder();
private MiniKdc miniKdc;
private OzoneConfiguration conf;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/CertificateClientTestImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/CertificateClientTestImpl.java
index b37f785..58021f3 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/CertificateClientTestImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/CertificateClientTestImpl.java
@@ -177,12 +177,12 @@ public class CertificateClientTestImpl implements CertificateClient {
}
@Override
- public String getSignatureAlgorithm(){
+ public String getSignatureAlgorithm() {
return securityConfig.getSignatureAlgo();
}
@Override
- public String getSecurityProvider(){
+ public String getSecurityProvider() {
return securityConfig.getProvider();
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java
index e03c5a9..82f23a6 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java
@@ -314,7 +314,7 @@ public class TestCommitWatcher {
// is updated to the latest index in putBlock response.
watcher.watchForCommit(replies.get(1).getLogIndex() + 100);
Assert.fail("Expected exception not thrown");
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
// with retry count set to noRetry and a lower watch request
// timeout, watch request will eventually
// fail with TimeoutIOException from ratis client or the client
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java
index ac62bc0..b16b824 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java
@@ -59,7 +59,7 @@ import org.junit.rules.Timeout;
/**
* Tests Close Container Exception handling by Ozone Client.
*/
-public class TestDiscardPreallocatedBlocks{
+public class TestDiscardPreallocatedBlocks {
/**
* Set a timeout for each test.
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
index e1358eb..155f785 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
@@ -212,7 +212,7 @@ public class TestFailureHandlingByClient {
OzoneOutputStream key =
createKey(keyName, ReplicationType.RATIS, 0);
String data = ContainerTestHelper
- .getFixedLengthString(keyString, chunkSize/2);
+ .getFixedLengthString(keyString, chunkSize / 2);
key.write(data.getBytes(UTF_8));
// get the name of a valid container
Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
index 9a4d691..4ebcc87 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
@@ -178,7 +178,7 @@ public class TestOzoneAtRestEncryption {
*/
@AfterClass
public static void shutdown() throws IOException {
- if(ozClient != null) {
+ if (ozClient != null) {
ozClient.close();
}
@@ -251,7 +251,7 @@ public class TestOzoneAtRestEncryption {
byte[] fileContent;
int len = 0;
- try(OzoneInputStream is = bucket.readKey(keyName)) {
+ try (OzoneInputStream is = bucket.readKey(keyName)) {
fileContent = new byte[value.getBytes(StandardCharsets.UTF_8).length];
len = is.read(fileContent);
}
@@ -267,7 +267,7 @@ public class TestOzoneAtRestEncryption {
}
private OzoneBucket createVolumeAndBucket(String volumeName,
- String bucketName) throws Exception{
+ String bucketName) throws Exception {
store.createVolume(volumeName);
OzoneVolume volume = store.getVolume(volumeName);
BucketArgs bucketArgs = BucketArgs.newBuilder()
@@ -333,7 +333,7 @@ public class TestOzoneAtRestEncryption {
byte[] fileContent;
int len = 0;
- try(OzoneInputStream is = bucket.readKey(keyName)) {
+ try (OzoneInputStream is = bucket.readKey(keyName)) {
fileContent = new byte[value.getBytes(StandardCharsets.UTF_8).length];
len = is.read(fileContent);
}
@@ -498,7 +498,7 @@ public class TestOzoneAtRestEncryption {
// Read different data lengths and starting from different offsets and
// verify the data matches.
Random random = new Random();
- int randomSize = random.nextInt(keySize/2);
+ int randomSize = random.nextInt(keySize / 2);
int randomOffset = random.nextInt(keySize - randomSize);
int[] readDataSizes = {keySize, keySize / 3 + 1, BLOCK_SIZE,
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
index 636029c..9ea04d4 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
@@ -140,7 +140,7 @@ public class TestOzoneClientMultipartUploadWithFSO {
* Close OzoneClient and shutdown MiniOzoneCluster.
*/
static void shutdownCluster() throws IOException {
- if(ozClient != null) {
+ if (ozClient != null) {
ozClient.close();
}
@@ -609,11 +609,11 @@ public class TestOzoneClientMultipartUploadWithFSO {
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(1, partName1);
- String partName2 =uploadPart(bucket, keyName, uploadID, 2,
+ String partName2 = uploadPart(bucket, keyName, uploadID, 2,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(2, partName2);
- String partName3 =uploadPart(bucket, keyName, uploadID, 3,
+ String partName3 = uploadPart(bucket, keyName, uploadID, 3,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(3, partName3);
@@ -711,11 +711,11 @@ public class TestOzoneClientMultipartUploadWithFSO {
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(1, partName1);
- String partName2 =uploadPart(bucket, keyName, uploadID, 2,
+ String partName2 = uploadPart(bucket, keyName, uploadID, 2,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(2, partName2);
- String partName3 =uploadPart(bucket, keyName, uploadID, 3,
+ String partName3 = uploadPart(bucket, keyName, uploadID, 3,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(3, partName3);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java
index 3cda449..ea992f5 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientRetriesOnExceptions.java
@@ -191,8 +191,8 @@ public class TestOzoneClientRetriesOnExceptions {
@Test
public void testMaxRetriesByOzoneClient() throws Exception {
String keyName = getKeyName();
- OzoneOutputStream key =
- createKey(keyName, ReplicationType.RATIS, (MAX_RETRIES+1) * blockSize);
+ OzoneOutputStream key = createKey(
+ keyName, ReplicationType.RATIS, (MAX_RETRIES + 1) * blockSize);
Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
KeyOutputStream keyOutputStream = (KeyOutputStream) key.getOutputStream();
List<BlockOutputStreamEntry> entries = keyOutputStream.getStreamEntries();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
index e70087a..128c407 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
@@ -203,7 +203,7 @@ public abstract class TestOzoneRpcClientAbstract {
* Close OzoneClient and shutdown MiniOzoneCluster.
*/
static void shutdownCluster() throws IOException {
- if(ozClient != null) {
+ if (ozClient != null) {
ozClient.close();
}
@@ -224,7 +224,7 @@ public abstract class TestOzoneRpcClientAbstract {
TestOzoneRpcClientAbstract.ozClient = ozClient;
}
- public static void setOzoneManager(OzoneManager ozoneManager){
+ public static void setOzoneManager(OzoneManager ozoneManager) {
TestOzoneRpcClientAbstract.ozoneManager = ozoneManager;
}
@@ -1091,7 +1091,7 @@ public abstract class TestOzoneRpcClientAbstract {
private void writeKey(OzoneBucket bucket, String keyName,
ReplicationFactor replication, String value, int valueLength)
- throws IOException{
+ throws IOException {
OzoneOutputStream out = bucket.createKey(keyName, valueLength, RATIS,
replication, new HashMap<>());
out.write(value.getBytes(UTF_8));
@@ -1100,7 +1100,7 @@ public abstract class TestOzoneRpcClientAbstract {
private void writeFile(OzoneBucket bucket, String keyName,
ReplicationFactor replication, String value, int valueLength)
- throws IOException{
+ throws IOException {
OzoneOutputStream out = bucket.createFile(keyName, valueLength, RATIS,
replication, true, true);
out.write(value.getBytes(UTF_8));
@@ -1901,33 +1901,33 @@ public abstract class TestOzoneRpcClientAbstract {
String volBase = "vol-list-";
//Create 10 volume vol-list-a-0-<random> to vol-list-a-9-<random>
String volBaseNameA = volBase + "a-";
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
store.createVolume(
volBaseNameA + i + "-" + RandomStringUtils.randomNumeric(5));
}
//Create 10 volume vol-list-b-0-<random> to vol-list-b-9-<random>
String volBaseNameB = volBase + "b-";
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
store.createVolume(
volBaseNameB + i + "-" + RandomStringUtils.randomNumeric(5));
}
Iterator<? extends OzoneVolume> volIterator = store.listVolumes(volBase);
int totalVolumeCount = 0;
- while(volIterator.hasNext()) {
+ while (volIterator.hasNext()) {
volIterator.next();
totalVolumeCount++;
}
Assert.assertEquals(20, totalVolumeCount);
Iterator<? extends OzoneVolume> volAIterator = store.listVolumes(
volBaseNameA);
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
Assert.assertTrue(volAIterator.next().getName()
.startsWith(volBaseNameA + i + "-"));
}
Assert.assertFalse(volAIterator.hasNext());
Iterator<? extends OzoneVolume> volBIterator = store.listVolumes(
volBaseNameB);
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
Assert.assertTrue(volBIterator.next().getName()
.startsWith(volBaseNameB + i + "-"));
}
@@ -1950,7 +1950,7 @@ public abstract class TestOzoneRpcClientAbstract {
//Create 10 buckets in vol-a-<random> and 10 in vol-b-<random>
String bucketBaseNameA = "bucket-a-";
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
volA.createBucket(
bucketBaseNameA + i + "-" + RandomStringUtils.randomNumeric(5));
volB.createBucket(
@@ -1958,7 +1958,7 @@ public abstract class TestOzoneRpcClientAbstract {
}
//Create 10 buckets in vol-a-<random> and 10 in vol-b-<random>
String bucketBaseNameB = "bucket-b-";
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
volA.createBucket(
bucketBaseNameB + i + "-" + RandomStringUtils.randomNumeric(5));
volB.createBucket(
@@ -1967,7 +1967,7 @@ public abstract class TestOzoneRpcClientAbstract {
Iterator<? extends OzoneBucket> volABucketIter =
volA.listBuckets("bucket-");
int volABucketCount = 0;
- while(volABucketIter.hasNext()) {
+ while (volABucketIter.hasNext()) {
volABucketIter.next();
volABucketCount++;
}
@@ -1975,7 +1975,7 @@ public abstract class TestOzoneRpcClientAbstract {
Iterator<? extends OzoneBucket> volBBucketIter =
volA.listBuckets("bucket-");
int volBBucketCount = 0;
- while(volBBucketIter.hasNext()) {
+ while (volBBucketIter.hasNext()) {
volBBucketIter.next();
volBBucketCount++;
}
@@ -1984,7 +1984,7 @@ public abstract class TestOzoneRpcClientAbstract {
Iterator<? extends OzoneBucket> volABucketAIter =
volA.listBuckets("bucket-a-");
int volABucketACount = 0;
- while(volABucketAIter.hasNext()) {
+ while (volABucketAIter.hasNext()) {
volABucketAIter.next();
volABucketACount++;
}
@@ -1992,21 +1992,21 @@ public abstract class TestOzoneRpcClientAbstract {
Iterator<? extends OzoneBucket> volBBucketBIter =
volA.listBuckets("bucket-b-");
int volBBucketBCount = 0;
- while(volBBucketBIter.hasNext()) {
+ while (volBBucketBIter.hasNext()) {
volBBucketBIter.next();
volBBucketBCount++;
}
Assert.assertEquals(10, volBBucketBCount);
Iterator<? extends OzoneBucket> volABucketBIter = volA.listBuckets(
"bucket-b-");
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
Assert.assertTrue(volABucketBIter.next().getName()
.startsWith(bucketBaseNameB + i + "-"));
}
Assert.assertFalse(volABucketBIter.hasNext());
Iterator<? extends OzoneBucket> volBBucketAIter = volB.listBuckets(
"bucket-a-");
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
Assert.assertTrue(volBBucketAIter.next().getName()
.startsWith(bucketBaseNameA + i + "-"));
}
@@ -2021,7 +2021,7 @@ public abstract class TestOzoneRpcClientAbstract {
store.createVolume(volume);
OzoneVolume vol = store.getVolume(volume);
Iterator<? extends OzoneBucket> buckets = vol.listBuckets("");
- while(buckets.hasNext()) {
+ while (buckets.hasNext()) {
fail();
}
}
@@ -2115,7 +2115,7 @@ public abstract class TestOzoneRpcClientAbstract {
Iterator<? extends OzoneKey> volABucketAIter =
volAbucketA.listKeys("key-");
int volABucketAKeyCount = 0;
- while(volABucketAIter.hasNext()) {
+ while (volABucketAIter.hasNext()) {
volABucketAIter.next();
volABucketAKeyCount++;
}
@@ -2123,7 +2123,7 @@ public abstract class TestOzoneRpcClientAbstract {
Iterator<? extends OzoneKey> volABucketBIter =
volAbucketB.listKeys("key-");
int volABucketBKeyCount = 0;
- while(volABucketBIter.hasNext()) {
+ while (volABucketBIter.hasNext()) {
volABucketBIter.next();
volABucketBKeyCount++;
}
@@ -2131,7 +2131,7 @@ public abstract class TestOzoneRpcClientAbstract {
Iterator<? extends OzoneKey> volBBucketAIter =
volBbucketA.listKeys("key-");
int volBBucketAKeyCount = 0;
- while(volBBucketAIter.hasNext()) {
+ while (volBBucketAIter.hasNext()) {
volBBucketAIter.next();
volBBucketAKeyCount++;
}
@@ -2139,7 +2139,7 @@ public abstract class TestOzoneRpcClientAbstract {
Iterator<? extends OzoneKey> volBBucketBIter =
volBbucketB.listKeys("key-");
int volBBucketBKeyCount = 0;
- while(volBBucketBIter.hasNext()) {
+ while (volBBucketBIter.hasNext()) {
volBBucketBIter.next();
volBBucketBKeyCount++;
}
@@ -2147,14 +2147,14 @@ public abstract class TestOzoneRpcClientAbstract {
Iterator<? extends OzoneKey> volABucketAKeyAIter =
volAbucketA.listKeys("key-a-");
int volABucketAKeyACount = 0;
- while(volABucketAKeyAIter.hasNext()) {
+ while (volABucketAKeyAIter.hasNext()) {
volABucketAKeyAIter.next();
volABucketAKeyACount++;
}
Assert.assertEquals(10, volABucketAKeyACount);
Iterator<? extends OzoneKey> volABucketAKeyBIter =
volAbucketA.listKeys("key-b-");
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
Assert.assertTrue(volABucketAKeyBIter.next().getName()
.startsWith("key-b-" + i + "-"));
}
@@ -2171,7 +2171,7 @@ public abstract class TestOzoneRpcClientAbstract {
vol.createBucket(bucket);
OzoneBucket buc = vol.getBucket(bucket);
Iterator<? extends OzoneKey> keys = buc.listKeys("");
- while(keys.hasNext()) {
+ while (keys.hasNext()) {
fail();
}
}
@@ -2821,11 +2821,11 @@ public abstract class TestOzoneRpcClientAbstract {
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(1, partName1);
- String partName2 =uploadPart(bucket, keyName, uploadID, 2,
+ String partName2 = uploadPart(bucket, keyName, uploadID, 2,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(2, partName2);
- String partName3 =uploadPart(bucket, keyName, uploadID, 3,
+ String partName3 = uploadPart(bucket, keyName, uploadID, 3,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(3, partName3);
@@ -2872,11 +2872,11 @@ public abstract class TestOzoneRpcClientAbstract {
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(1, partName1);
- String partName2 =uploadPart(bucket, keyName, uploadID, 2,
+ String partName2 = uploadPart(bucket, keyName, uploadID, 2,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(2, partName2);
- String partName3 =uploadPart(bucket, keyName, uploadID, 3,
+ String partName3 = uploadPart(bucket, keyName, uploadID, 3,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
partsMap.put(3, partName3);
@@ -3261,7 +3261,7 @@ public abstract class TestOzoneRpcClientAbstract {
List<OzoneAcl> expectedAcls = getAclList(new OzoneConfiguration());
// Case:1 Add new acl permission to existing acl.
- if(expectedAcls.size()>0) {
+ if (expectedAcls.size() > 0) {
OzoneAcl oldAcl = expectedAcls.get(0);
OzoneAcl newAcl = new OzoneAcl(oldAcl.getType(), oldAcl.getName(),
ACLType.READ_ACL, oldAcl.getAclScope());
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java
index 8ad62f2..c5e54db 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java
@@ -162,7 +162,7 @@ public class TestOzoneRpcClientForAclAuditLog {
* Close OzoneClient and shutdown MiniOzoneCluster.
*/
private static void shutdownCluster() throws IOException {
- if(ozClient != null) {
+ if (ozClient != null) {
ozClient.close();
}
@@ -246,28 +246,28 @@ public class TestOzoneRpcClientForAclAuditLog {
// xxxAcl will fail as current ugi user doesn't have the required access
// for volume
- try{
+ try {
List<OzoneAcl> acls = store.getAcl(volObj);
} catch (Exception ex) {
verifyLog(OMAction.GET_ACL.name(), volumeName,
AuditEventStatus.FAILURE.name());
}
- try{
+ try {
store.addAcl(volObj, USER_ACL);
} catch (Exception ex) {
verifyLog(OMAction.ADD_ACL.name(), volumeName,
AuditEventStatus.FAILURE.name());
}
- try{
+ try {
store.removeAcl(volObj, USER_ACL);
} catch (Exception ex) {
verifyLog(OMAction.REMOVE_ACL.name(), volumeName,
AuditEventStatus.FAILURE.name());
}
- try{
+ try {
store.setAcl(volObj, aclListToAdd);
} catch (Exception ex) {
verifyLog(OMAction.SET_ACL.name(), volumeName, "johndoe", "jane",
@@ -282,16 +282,16 @@ public class TestOzoneRpcClientForAclAuditLog {
GenericTestUtils.waitFor(() ->
(lines != null) ? true : false, 100, 60000);
- try{
+ try {
// When log entry is expected, the log file will contain one line and
// that must be equal to the expected string
assertTrue(lines.size() != 0);
- for(String exp: expected){
+ for (String exp: expected) {
assertTrue(lines.get(0).contains(exp));
}
- } catch (AssertionError ex){
+ } catch (AssertionError ex) {
LOG.error("Error occurred in log verification", ex);
- if(lines.size() != 0){
+ if (lines.size() != 0) {
LOG.error("Actual line ::: " + lines.get(0));
LOG.error("Expected tokens ::: " + Arrays.toString(expected));
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithKeyLatestVersion.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithKeyLatestVersion.java
index 6cd85a1..5ac78b8 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithKeyLatestVersion.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithKeyLatestVersion.java
@@ -191,7 +191,7 @@ public class TestOzoneRpcClientWithKeyLatestVersion {
}
private void testListStatus(String volumeName, String bucketName,
- String keyName, boolean versioning) throws Exception{
+ String keyName, boolean versioning) throws Exception {
OzoneVolume volume = objectStore.getVolume(volumeName);
OzoneBucket ozoneBucket = volume.getBucket(bucketName);
List<OzoneFileStatus> ozoneFileStatusList = ozoneBucket.listStatus(keyName,
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java
index 751fd26..791a226 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java
@@ -139,7 +139,7 @@ public class TestReadRetries {
*/
@After
public void shutdown() throws IOException {
- if(ozClient != null) {
+ if (ozClient != null) {
ozClient.close();
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
index a525499..5abc09e 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestSecureOzoneRpcClient.java
@@ -119,7 +119,7 @@ public class TestSecureOzoneRpcClient extends TestOzoneRpcClient {
.setCertificateClient(certificateClientTest)
.build();
secretManager = new OzoneBlockTokenSecretManager(new SecurityConfig(conf),
- 60 *60, certificateClientTest.getCertificate().
+ 60 * 60, certificateClientTest.getCertificate().
getSerialNumber().toString());
secretManager.start(certificateClientTest);
cluster.getOzoneManager().startSecretManager();
@@ -168,7 +168,7 @@ public class TestSecureOzoneRpcClient extends TestOzoneRpcClient {
OzoneKey key = bucket.getKey(keyName);
Assert.assertEquals(keyName, key.getName());
byte[] fileContent;
- try(OzoneInputStream is = bucket.readKey(keyName)) {
+ try (OzoneInputStream is = bucket.readKey(keyName)) {
fileContent = new byte[value.getBytes(UTF_8).length];
is.read(fileContent);
}
@@ -342,7 +342,7 @@ public class TestSecureOzoneRpcClient extends TestOzoneRpcClient {
*/
@AfterClass
public static void shutdown() throws IOException {
- if(ozClient != null) {
+ if (ozClient != null) {
ozClient.close();
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
index d6821c4..aa6ff93 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestWatchForCommit.java
@@ -364,7 +364,7 @@ public class TestWatchForCommit {
.watchForCommit(reply.getLogIndex() +
new Random().nextInt(100) + 10);
Assert.fail("Expected exception not thrown");
- } catch(Exception e) {
+ } catch (Exception e) {
Assert.assertTrue(HddsClientUtils
.checkForException(e) instanceof GroupMismatchException);
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestInputStreamBase.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestInputStreamBase.java
index e9b82e4..7f0ab38 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestInputStreamBase.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestInputStreamBase.java
@@ -198,7 +198,7 @@ public abstract class TestInputStreamBase {
byte[] expectedData = new byte[readDataLen];
System.arraycopy(inputData, (int) offset, expectedData, 0, readDataLen);
- for (int i=0; i < readDataLen; i++) {
+ for (int i = 0; i < readDataLen; i++) {
Assert.assertEquals("Read data at does not match the input data at " +
"position " + (offset + i), expectedData[i], readData[i]);
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
index f16c3ed..4b83429 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
@@ -77,18 +77,18 @@ public class TestKeyInputStream extends TestInputStreamBase {
private void randomSeek(int dataLength, KeyInputStream keyInputStream,
byte[] inputData) throws Exception {
// Do random seek.
- for (int i=0; i<dataLength - 300; i+=20) {
+ for (int i = 0; i < dataLength - 300; i += 20) {
validate(keyInputStream, inputData, i, 200);
}
// Seek to end and read in reverse order. And also this is partial chunks
// as readLength is 20, chunk length is 100.
- for (int i=dataLength - 100; i>=100; i-=20) {
+ for (int i = dataLength - 100; i >= 100; i -= 20) {
validate(keyInputStream, inputData, i, 20);
}
// Start from begin and seek such that we read partially chunks.
- for (int i=0; i<dataLength - 300; i+=20) {
+ for (int i = 0; i < dataLength - 300; i += 20) {
validate(keyInputStream, inputData, i, 90);
}
@@ -173,7 +173,7 @@ public class TestKeyInputStream extends TestInputStreamBase {
KeyInputStream keyInputStream = getKeyInputStream(keyName);
// Seek to some where end.
- validate(keyInputStream, inputData, dataLength-200, 100);
+ validate(keyInputStream, inputData, dataLength - 200, 100);
// Now seek to start.
validate(keyInputStream, inputData, 0, 140);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java
index 3382180..d629f2f 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java
@@ -263,7 +263,7 @@ public class TestCloseContainerByPipeline {
Container dnContainer = cluster.getHddsDatanodes().get(index)
.getDatanodeStateMachine().getContainer().getContainerSet()
.getContainer(containerID);
- try(ReferenceCountedDB store = BlockUtils.getDB(
+ try (ReferenceCountedDB store = BlockUtils.getDB(
(KeyValueContainerData) dnContainer.getContainerData(), conf)) {
metadataStores.add(store);
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java
index 0a0e0fa..d298ac5 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java
@@ -282,7 +282,7 @@ public class TestDeleteContainerHandler {
private Boolean isContainerClosed(HddsDatanodeService hddsDatanodeService,
long containerID) {
ContainerData containerData;
- containerData =hddsDatanodeService
+ containerData = hddsDatanodeService
.getDatanodeStateMachine().getContainer().getContainerSet()
.getContainer(containerID).getContainerData();
return !containerData.isOpen();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
index b6a5a03..fb015bb 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java
@@ -112,7 +112,7 @@ public class TestContainerMetrics {
Handler.getHandlerForContainerType(containerType, conf,
context.getParent().getDatanodeDetails().getUuidString(),
containerSet, volumeSet, metrics,
- c -> {}));
+ c -> { }));
}
HddsDispatcher dispatcher = new HddsDispatcher(conf, containerSet,
volumeSet, handlers, context, metrics, null);
@@ -182,7 +182,7 @@ public class TestContainerMetrics {
}
// clean up volume dir
File file = new File(path);
- if(file.exists()) {
+ if (file.exists()) {
FileUtil.fullyDelete(file);
}
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
index 4f0c437..c7bf1f8 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
@@ -487,7 +487,7 @@ public class TestOzoneContainer {
final List<CompletableFuture> computeResults = new LinkedList<>();
int requestCount = 1000;
// Create a bunch of Async calls from this test.
- for(int x = 0; x <requestCount; x++) {
+ for (int x = 0; x < requestCount; x++) {
BlockID blockID = ContainerTestHelper.getTestBlockID(containerID);
final ContainerProtos.ContainerCommandRequestProto smallFileRequest
= ContainerTestHelper.getWriteSmallFileRequest(
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
index a2131a6..c2720d9 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
@@ -212,7 +212,7 @@ public class TestContainerServer {
Handler.getHandlerForContainerType(containerType, conf,
context.getParent().getDatanodeDetails().getUuidString(),
containerSet, volumeSet, metrics,
- c -> {}));
+ c -> { }));
}
HddsDispatcher dispatcher = new HddsDispatcher(
conf, containerSet, volumeSet, handlers, context, metrics, null);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
index a5fcbb9..6ff49c6 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
@@ -169,7 +169,7 @@ public class TestSecureContainerServer {
.getPort(DatanodeDetails.Port.Name.STANDALONE).getValue()),
XceiverClientGrpc::new,
(dn, conf) -> new XceiverServerGrpc(dd, conf,
- hddsDispatcher, caClient), (dn, p) -> {}, (p) -> {});
+ hddsDispatcher, caClient), (dn, p) -> { }, (p) -> { });
}
private static HddsDispatcher createDispatcher(DatanodeDetails dd, UUID scmId,
@@ -194,7 +194,7 @@ public class TestSecureContainerServer {
Handler.getHandlerForContainerType(containerType, conf,
dd.getUuid().toString(),
containerSet, volumeSet, metrics,
- c -> {}));
+ c -> { }));
}
HddsDispatcher hddsDispatcher = new HddsDispatcher(
conf, containerSet, volumeSet, handlers, context, metrics,
@@ -234,7 +234,7 @@ public class TestSecureContainerServer {
XceiverClientRatis::newXceiverClientRatis,
TestSecureContainerServer::newXceiverServerRatis,
(dn, p) -> RatisTestHelper.initXceiverServerRatis(rpc, dn, p),
- (p) -> {});
+ (p) -> { });
}
private static void runTestClientServer(
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/volume/TestDatanodeHddsVolumeFailureDetection.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/volume/TestDatanodeHddsVolumeFailureDetection.java
index af39055..2a58730 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/volume/TestDatanodeHddsVolumeFailureDetection.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/volume/TestDatanodeHddsVolumeFailureDetection.java
@@ -224,7 +224,7 @@ public class TestDatanodeHddsVolumeFailureDetection {
try {
c1.close();
Assert.fail();
- } catch(Exception e) {
+ } catch (Exception e) {
Assert.assertTrue(e instanceof IOException);
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java
index a01d492..f67783b 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java
@@ -152,28 +152,28 @@ public class TestHadoopNestedDirGenerator {
int span, int actualDepth) throws IOException {
int depth = 0;
Path p = null;
- if(span > 0){
+ if (span > 0) {
depth = 0;
- } else if(span == 0){
+ } else if (span == 0) {
depth = 1;
- } else{
+ } else {
LOG.info("Span value can never be negative");
}
LinkedList<FileStatus> queue = new LinkedList<FileStatus>();
FileStatus f1 = fileStatuses[0];
queue.add(f1);
- while(queue.size() != 0){
+ while (queue.size() != 0) {
FileStatus f = queue.poll();
FileStatus[] temp = fs.listStatus(f.getPath());
- if(temp.length > 0){
+ if (temp.length > 0) {
++depth;
- for(int i = 0; i < temp.length; i++){
+ for (int i = 0; i < temp.length; i++) {
queue.add(temp[i]);
}
}
- if(span == 0){
+ if (span == 0) {
p = f.getPath();
- } else{
+ } else {
p = f.getPath().getParent();
}
}
@@ -188,17 +188,17 @@ public class TestHadoopNestedDirGenerator {
* and count the span directories.
*/
- private int spanCheck(FileSystem fs, int span, Path p) throws IOException{
+ private int spanCheck(FileSystem fs, int span, Path p) throws IOException {
int sp = 0;
int depth = 0;
- if(span >= 0){
+ if (span >= 0) {
depth = 0;
- } else{
+ } else {
LOG.info("Span value can never be negative");
}
FileStatus[] fileStatuses = fs.listStatus(p);
- for (FileStatus fileStatus : fileStatuses){
- if(fileStatus.isDirectory()){
+ for (FileStatus fileStatus : fileStatuses) {
+ if (fileStatus.isDirectory()) {
++sp;
}
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
index d691f2c..68cc824 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
@@ -348,7 +348,7 @@ public class TestKeyManagerImpl {
OmKeyArgs keyArgs = createBuilder()
.setKeyName(keyNameBuf.toString())
.build();
- for (int i =0; i< 5; i++) {
+ for (int i = 0; i < 5; i++) {
keyNameBuf.append("/").append(RandomStringUtils.randomAlphabetic(5));
}
String keyName = keyNameBuf.toString();
@@ -418,7 +418,7 @@ public class TestKeyManagerImpl {
// recursive flag is set to false
StringBuffer keyNameBuf = new StringBuffer();
keyNameBuf.append(RandomStringUtils.randomAlphabetic(5));
- for (int i =0; i< 5; i++) {
+ for (int i = 0; i < 5; i++) {
keyNameBuf.append("/").append(RandomStringUtils.randomAlphabetic(5));
}
keyName = keyNameBuf.toString();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmLDBCli.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmLDBCli.java
index a59983f..beaf10c 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmLDBCli.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmLDBCli.java
@@ -70,7 +70,7 @@ public class TestOmLDBCli {
@After
public void shutdown() throws Exception {
- if (dbStore!=null){
+ if (dbStore != null) {
dbStore.close();
}
}
@@ -78,7 +78,7 @@ public class TestOmLDBCli {
@Test
public void testOMDB() throws Exception {
File newFolder = folder.newFolder();
- if(!newFolder.exists()) {
+ if (!newFolder.exists()) {
Assert.assertTrue(newFolder.mkdirs());
}
// Dummy om.db with only keyTable
@@ -88,11 +88,11 @@ public class TestOmLDBCli {
.addTable("keyTable")
.build();
// insert 5 keys
- for (int i = 0; i<5; i++) {
+ for (int i = 0; i < 5; i++) {
OmKeyInfo value = OMRequestTestUtils.createOmKeyInfo("sampleVol",
- "sampleBuck", "key" + (i+1), HddsProtos.ReplicationType.STAND_ALONE,
+ "sampleBuck", "key" + (i + 1), HddsProtos.ReplicationType.STAND_ALONE,
HddsProtos.ReplicationFactor.ONE);
- String key = "key"+ (i);
+ String key = "key" + (i);
Table<byte[], byte[]> keyTable = dbStore.getTable("keyTable");
byte[] arr = value.getProtobuf(CURRENT_VERSION).toByteArray();
keyTable.put(key.getBytes(UTF_8), arr);
@@ -111,7 +111,7 @@ public class TestOmLDBCli {
try {
getKeyNames(dbScanner);
Assert.fail("IllegalArgumentException is expected");
- }catch (IllegalArgumentException e){
+ } catch (IllegalArgumentException e) {
//ignore
}
@@ -177,7 +177,7 @@ public class TestOmLDBCli {
scanner.setTableName("keyTable");
scanner.call();
Assert.assertFalse(scanner.getScannedObjects().isEmpty());
- for (Object o : scanner.getScannedObjects()){
+ for (Object o : scanner.getScannedObjects()) {
OmKeyInfo keyInfo = (OmKeyInfo)o;
keyNames.add(keyInfo.getKeyName());
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
index 9410973..9b9d6d8 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
@@ -521,7 +521,7 @@ public class TestOmMetrics {
}
try {
- long id = (keySession != null)?keySession.getId():0;
+ long id = (keySession != null) ? keySession.getId() : 0;
writeClient.commitKey(keyArgs, id);
} catch (IOException ignored) {
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmStartupSlvLessThanMlv.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmStartupSlvLessThanMlv.java
index adccc7a..f773861 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmStartupSlvLessThanMlv.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmStartupSlvLessThanMlv.java
@@ -70,7 +70,7 @@ public class TestOmStartupSlvLessThanMlv {
try {
clusterBuilder.build();
Assert.fail("Expected OMException due to incorrect MLV on OM creation.");
- } catch(OMException e) {
+ } catch (OMException e) {
String expectedMessage = String.format("Cannot initialize " +
"VersionManager. Metadata layout version (%s) > software layout" +
" version (%s)", mlv, largestSlv);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
index 36a17a8..389217a 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
@@ -240,7 +240,7 @@ public class TestOzoneManagerConfiguration {
OMConfigKeys.OZONE_OM_RATIS_PORT_DEFAULT;
break;
case omNode2Id :
- expectedPeerAddress = "0.0.0.0:"+
+ expectedPeerAddress = "0.0.0.0:" +
OMConfigKeys.OZONE_OM_RATIS_PORT_DEFAULT;
break;
case omNode3Id :
@@ -323,7 +323,7 @@ public class TestOzoneManagerConfiguration {
OMConfigKeys.OZONE_OM_RATIS_PORT_DEFAULT;
break;
case omNode2Id :
- expectedPeerAddress = "0.0.0.0:"+
+ expectedPeerAddress = "0.0.0.0:" +
OMConfigKeys.OZONE_OM_RATIS_PORT_DEFAULT;
break;
case omNode3Id :
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithACL.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithACL.java
index 06a3a97..3af7f01 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithACL.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithACL.java
@@ -184,7 +184,7 @@ public class TestOzoneManagerHAWithACL extends TestOzoneManagerHA {
public void testAddPrefixAcl() throws Exception {
OzoneBucket ozoneBucket = setupBucket();
String remoteUserName = "remoteUser";
- String prefixName = RandomStringUtils.randomAlphabetic(5) +"/";
+ String prefixName = RandomStringUtils.randomAlphabetic(5) + "/";
OzoneAcl defaultUserAcl = new OzoneAcl(USER, remoteUserName,
READ, DEFAULT);
@@ -201,7 +201,7 @@ public class TestOzoneManagerHAWithACL extends TestOzoneManagerHA {
public void testRemovePrefixAcl() throws Exception {
OzoneBucket ozoneBucket = setupBucket();
String remoteUserName = "remoteUser";
- String prefixName = RandomStringUtils.randomAlphabetic(5) +"/";
+ String prefixName = RandomStringUtils.randomAlphabetic(5) + "/";
OzoneAcl userAcl = new OzoneAcl(USER, remoteUserName,
READ, ACCESS);
OzoneAcl userAcl1 = new OzoneAcl(USER, "remote",
@@ -237,7 +237,7 @@ public class TestOzoneManagerHAWithACL extends TestOzoneManagerHA {
public void testSetPrefixAcl() throws Exception {
OzoneBucket ozoneBucket = setupBucket();
String remoteUserName = "remoteUser";
- String prefixName = RandomStringUtils.randomAlphabetic(5) +"/";
+ String prefixName = RandomStringUtils.randomAlphabetic(5) + "/";
OzoneAcl defaultUserAcl = new OzoneAcl(USER, remoteUserName,
READ, DEFAULT);
@@ -304,7 +304,7 @@ public class TestOzoneManagerHAWithACL extends TestOzoneManagerHA {
}
private void testRemoveAcl(String remoteUserName, OzoneObj ozoneObj,
- OzoneAcl userAcl) throws Exception{
+ OzoneAcl userAcl) throws Exception {
ObjectStore objectStore = getObjectStore();
// As by default create will add some default acls in RpcClient.
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithData.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithData.java
index 7dbacc4..0c2f526 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithData.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithData.java
@@ -537,7 +537,7 @@ public class TestOzoneManagerHAWithData extends TestOzoneManagerHA {
Assert.assertTrue(partInfoList.size() == partsMap.size());
- for (int i=0; i< partsMap.size(); i++) {
+ for (int i = 0; i < partsMap.size(); i++) {
Assert.assertEquals(partsMap.get(partInfoList.get(i).getPartNumber()),
partInfoList.get(i).getPartName());
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
index 9b0d8bc..9de622c 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
@@ -88,7 +88,7 @@ public class TestOzoneManagerRestInterface {
ObjectMapper objectMapper = new ObjectMapper();
TypeReference<List<ServiceInfo>> serviceInfoReference =
- new TypeReference<List<ServiceInfo>>() {};
+ new TypeReference<List<ServiceInfo>>() { };
List<ServiceInfo> serviceInfos = objectMapper.readValue(
serviceListJson, serviceInfoReference);
Map<HddsProtos.NodeType, ServiceInfo> serviceMap = new HashMap<>();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconScmSnapshot.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconScmSnapshot.java
index 08f465f..db5c327 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconScmSnapshot.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconScmSnapshot.java
@@ -69,7 +69,7 @@ public class TestReconScmSnapshot {
testSnapshot(ozoneCluster);
}
- public static void testSnapshot(MiniOzoneCluster cluster) throws Exception{
+ public static void testSnapshot(MiniOzoneCluster cluster) throws Exception {
GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer
.captureLogs(LoggerFactory.getLogger(
ReconStorageContainerManagerFacade.class));
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
index 2818ed0..9e21311 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManager.java
@@ -350,7 +350,7 @@ public class TestReconWithOzoneManager {
* For test purpose each container will have only one key.
*/
private void addKeys(int start, int end) throws Exception {
- for(int i = start; i < end; i++) {
+ for (int i = start; i < end; i++) {
Pipeline pipeline = HddsTestUtils.getRandomPipeline();
List<OmKeyLocationInfo> omKeyLocationInfoList = new ArrayList<>();
BlockID blockID = new BlockID(i, 1);
@@ -359,7 +359,7 @@ public class TestReconWithOzoneManager {
omKeyLocationInfoList.add(omKeyLocationInfo1);
OmKeyLocationInfoGroup omKeyLocationInfoGroup = new
OmKeyLocationInfoGroup(0, omKeyLocationInfoList);
- writeDataToOm("key"+i, "bucket"+i, "vol"+i,
+ writeDataToOm("key" + i, "bucket" + i, "vol" + i,
Collections.singletonList(omKeyLocationInfoGroup));
}
}
@@ -367,7 +367,7 @@ public class TestReconWithOzoneManager {
private long getTableKeyCount(TableIterator<String, ? extends
Table.KeyValue<String, OmKeyInfo>> iterator) {
long keyCount = 0;
- while(iterator.hasNext()) {
+ while (iterator.hasNext()) {
keyCount++;
iterator.next();
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
index c16583c..e2d59df 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
@@ -133,7 +133,7 @@ public class TestReconWithOzoneManagerFSO {
Assert.assertEquals(0, entity.getNumTotalDir());
for (int i = 0; i < 10; i++) {
Assert.assertNotNull(impl.getOMMetadataManagerInstance()
- .getVolumeTable().get("/vol"+ i));
+ .getVolumeTable().get("/vol" + i));
}
addKeys(10, 12, "dir");
impl.syncDataFromOM();
@@ -141,7 +141,7 @@ public class TestReconWithOzoneManagerFSO {
// test Recon is sync'ed with OM.
for (int i = 10; i < 12; i++) {
Assert.assertNotNull(impl.getOMMetadataManagerInstance()
- .getVolumeTable().getSkipCache("/vol"+ i));
+ .getVolumeTable().getSkipCache("/vol" + i));
}
// test root response
@@ -161,8 +161,8 @@ public class TestReconWithOzoneManagerFSO {
* For test purpose each container will have only one key.
*/
private void addKeys(int start, int end, String dirPrefix) throws Exception {
- for(int i = start; i < end; i++) {
- writeKeys("vol"+i, "bucket"+i, dirPrefix + i + "/key"+i);
+ for (int i = start; i < end; i++) {
+ writeKeys("vol" + i, "bucket" + i, dirPrefix + i + "/key" + i);
}
}
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java
index e480d51..6586055 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java
@@ -64,7 +64,7 @@ public class TestAllocateContainer {
@AfterClass
public static void shutdown() throws InterruptedException {
- if(cluster != null) {
+ if (cluster != null) {
cluster.shutdown();
}
IOUtils.cleanupWithLogger(null, storageContainerLocationClient);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestCloseContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestCloseContainer.java
index 94b9984..2e67a88 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestCloseContainer.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestCloseContainer.java
@@ -102,8 +102,8 @@ public class TestCloseContainer {
public void testReplicasAreReportedForClosedContainerAfterRestart()
throws Exception {
// Create some keys to write data into the open containers
- for (int i=0; i<10; i++) {
- TestDataUtil.createKey(bucket, "key"+i, ReplicationFactor.THREE,
+ for (int i = 0; i < 10; i++) {
+ TestDataUtil.createKey(bucket, "key" + i, ReplicationFactor.THREE,
ReplicationType.RATIS, "this is the content");
}
StorageContainerManager scm = cluster.getStorageContainerManager();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
index 8ba2d52..9e00867 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java
@@ -151,14 +151,14 @@ public class TestSCMMXBean {
ContainerManager scmContainerManager = scm.getContainerManager();
List<ContainerInfo> containerInfoList = new ArrayList<>();
- for (int i=0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
containerInfoList.add(
scmContainerManager.allocateContainer(new StandaloneReplicationConfig(
ReplicationFactor.ONE),
UUID.randomUUID().toString()));
}
long containerID;
- for (int i=0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
if (i % 2 == 0) {
containerID = containerInfoList.get(i).getContainerID();
scmContainerManager.updateContainerState(
@@ -184,7 +184,7 @@ public class TestSCMMXBean {
containerStateCount = scm.getContainerStateCount();
containerStateCount.forEach((k, v) -> {
- if(k.equals(HddsProtos.LifeCycleState.CLOSING.toString())) {
+ if (k.equals(HddsProtos.LifeCycleState.CLOSING.toString())) {
assertEquals((int)v, 5);
} else if (k.equals(HddsProtos.LifeCycleState.CLOSED.toString())) {
assertEquals((int)v, 5);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientGrpc.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientGrpc.java
index a3bd295..8b7e0b4 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientGrpc.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientGrpc.java
@@ -61,7 +61,7 @@ public class TestXceiverClientGrpc {
dns.add(MockDatanodeDetails.randomDatanodeDetails());
dnsInOrder = new ArrayList<>();
- for (int i=2; i>=0; i--) {
+ for (int i = 2; i >= 0; i--) {
dnsInOrder.add(dns.get(i));
}
@@ -82,14 +82,14 @@ public class TestXceiverClientGrpc {
Assert.assertNotEquals(dns.get(0), dnsInOrder.get(0));
}
- @Test(timeout=5000)
+ @Test(timeout = 5000)
public void testRandomFirstNodeIsCommandTarget() throws IOException {
final ArrayList<DatanodeDetails> allDNs = new ArrayList<>(dns);
// Using a new Xceiver Client, call it repeatedly until all DNs in the
// pipeline have been the target of the command, indicating it is shuffling
// the DNs on each call with a new client. This test will timeout if this
// is not happening.
- while(allDNs.size() > 0) {
+ while (allDNs.size() > 0) {
XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf) {
@Override
public XceiverClientReply sendCommandAsync(
@@ -112,7 +112,7 @@ public class TestXceiverClientGrpc {
// With a new Client, make 100 calls and ensure the first sortedDN is used
// each time. The logic should always use the sorted node, so we can check
// only a single DN is ever seen after 100 calls.
- for (int i=0; i<100; i++) {
+ for (int i = 0; i < 100; i++) {
XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf) {
@Override
public XceiverClientReply sendCommandAsync(
@@ -131,7 +131,7 @@ public class TestXceiverClientGrpc {
public void testConnectionReusedAfterGetBlock() throws IOException {
// With a new Client, make 100 calls. On each call, ensure that only one
// DN is seen, indicating the same DN connection is reused.
- for (int i=0; i<100; i++) {
+ for (int i = 0; i < 100; i++) {
final Set<DatanodeDetails> seenDNs = new HashSet<>();
XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf) {
@Override
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDecommissionAndMaintenance.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDecommissionAndMaintenance.java
index 91bb899..65d7541 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDecommissionAndMaintenance.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestDecommissionAndMaintenance.java
@@ -358,14 +358,14 @@ public class TestDecommissionAndMaintenance {
Set<ContainerReplica> replicas = getContainerReplicas(container);
List<DatanodeDetails> forMaintenance = new ArrayList<>();
- replicas.forEach(r ->forMaintenance.add(r.getDatanodeDetails()));
+ replicas.forEach(r -> forMaintenance.add(r.getDatanodeDetails()));
scmClient.startMaintenanceNodes(forMaintenance.stream()
.map(d -> getDNHostAndPort(d))
.collect(Collectors.toList()), 0);
// Ensure all 3 DNs go to maintenance
- for(DatanodeDetails dn : forMaintenance) {
+ for (DatanodeDetails dn : forMaintenance) {
waitForDnToReachPersistedOpState(dn, IN_MAINTENANCE);
}
@@ -379,7 +379,7 @@ public class TestDecommissionAndMaintenance {
.collect(Collectors.toList()));
// Ensure all 3 DNs go to maintenance
- for(DatanodeDetails dn : forMaintenance) {
+ for (DatanodeDetails dn : forMaintenance) {
waitForDnToReachOpState(dn, IN_SERVICE);
}
@@ -400,26 +400,26 @@ public class TestDecommissionAndMaintenance {
Set<ContainerReplica> replicas = getContainerReplicas(container);
List<DatanodeDetails> forMaintenance = new ArrayList<>();
- replicas.forEach(r ->forMaintenance.add(r.getDatanodeDetails()));
+ replicas.forEach(r -> forMaintenance.add(r.getDatanodeDetails()));
scmClient.startMaintenanceNodes(forMaintenance.stream()
.map(d -> getDNHostAndPort(d))
.collect(Collectors.toList()), 0);
// Ensure all 3 DNs go to entering_maintenance
- for(DatanodeDetails dn : forMaintenance) {
+ for (DatanodeDetails dn : forMaintenance) {
waitForDnToReachPersistedOpState(dn, ENTERING_MAINTENANCE);
}
cluster.restartStorageContainerManager(true);
setManagers();
List<DatanodeDetails> newDns = new ArrayList<>();
- for(DatanodeDetails dn : forMaintenance) {
+ for (DatanodeDetails dn : forMaintenance) {
newDns.add(nm.getNodeByUuid(dn.getUuid().toString()));
}
// Ensure all 3 DNs go to maintenance
- for(DatanodeDetails dn : newDns) {
+ for (DatanodeDetails dn : newDns) {
waitForDnToReachOpState(dn, IN_MAINTENANCE);
}
@@ -550,7 +550,7 @@ public class TestDecommissionAndMaintenance {
*/
private void generateData(int keyCount, String keyPrefix,
ReplicationFactor repFactor, ReplicationType repType) throws IOException {
- for (int i=0; i<keyCount; i++) {
+ for (int i = 0; i < keyCount; i++) {
TestDataUtil.createKey(bucket, keyPrefix + i, repFactor, repType,
"this is the content");
}
@@ -610,7 +610,7 @@ public class TestDecommissionAndMaintenance {
* @return host:port for the given DN.
*/
private String getDNHostAndPort(DatanodeDetails dn) {
- return dn.getHostName()+":"+dn.getPorts().get(0).getValue();
+ return dn.getHostName() + ":" + dn.getPorts().get(0).getValue();
}
/**
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestQueryNode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestQueryNode.java
index 3ead3f4..56a61d1 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestQueryNode.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestQueryNode.java
@@ -92,7 +92,7 @@ public class TestQueryNode {
cluster = MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(numOfDatanodes)
- .setTotalPipelineNumLimit(numOfDatanodes + numOfDatanodes/2)
+ .setTotalPipelineNumLimit(numOfDatanodes + numOfDatanodes / 2)
.build();
cluster.waitForClusterToBeReady();
scmClient = new ContainerOperationClient(conf);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
index f525942..5ee2ac3 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
@@ -264,7 +264,7 @@ public class TestOzoneShellHA {
* @return String array.
*/
private String[] getHASetConfStrings(int numOfArgs) {
- assert(numOfArgs >= 0);
+ assert (numOfArgs >= 0);
String[] res = new String[1 + 1 + numOfOMs + numOfArgs];
final int indexOmServiceIds = 0;
final int indexOmNodes = 1;
@@ -280,7 +280,7 @@ public class TestOzoneShellHA {
String[] omNodesArr = omNodesVal.split(",");
// Sanity check
- assert(omNodesArr.length == numOfOMs);
+ assert (omNodesArr.length == numOfOMs);
for (int i = 0; i < numOfOMs; i++) {
res[indexOmAddressStart + i] =
getSetConfStringFromConf(ConfUtils.addKeySuffixes(
@@ -624,7 +624,7 @@ public class TestOzoneShellHA {
// create volume: vol1 with bucket: bucket1
final String testVolBucket = "/vol1/bucket1";
- final String testKey = testVolBucket+"/key1";
+ final String testKey = testVolBucket + "/key1";
final String[] volBucketArgs = new String[] {"-mkdir", "-p", testVolBucket};
final String[] keyArgs = new String[] {"-touch", testKey};
@@ -652,7 +652,7 @@ public class TestOzoneShellHA {
final String[] rmKeyArgs = new String[] {"-rm", "-R", testKey};
final String[] rmTrashArgs = new String[] {"-rm", "-R",
- testVolBucket+"/.Trash"};
+ testVolBucket + "/.Trash"};
final Path trashPathKey1 = Path.mergePaths(new Path(
new OFSPath(testKey).getTrashRoot(), new Path("Current")),
new Path(testKey));
@@ -666,11 +666,11 @@ public class TestOzoneShellHA {
Assert.assertEquals(0, res);
LOG.info("Executing testDeleteTrashNoSkipTrash: key1 deleted moved to"
- +" Trash: "+trashPathKey1.toString());
+ + " Trash: " + trashPathKey1.toString());
fs.getFileStatus(trashPathKey1);
LOG.info("Executing testDeleteTrashNoSkipTrash: deleting trash FsShell "
- +"with args{}: ", Arrays.asList(rmTrashArgs));
+ + "with args{}: ", Arrays.asList(rmTrashArgs));
res = ToolRunner.run(shell, rmTrashArgs);
Assert.assertEquals(0, res);
diff --git a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfo.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfo.java
index fc16b3c..a28c6d1 100644
--- a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfo.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfo.java
@@ -38,7 +38,7 @@ import static org.apache.hadoop.ozone.OzoneAcl.AclScope.ACCESS;
public class TestOmPrefixInfo {
private static OzoneManagerStorageProtos.OzoneAclInfo buildTestOzoneAclInfo(
- String aclString){
+ String aclString) {
OzoneAcl oacl = OzoneAcl.parseAcl(aclString);
ByteString rights = ByteString.copyFrom(oacl.getAclBitSet().toByteArray());
return OzoneManagerStorageProtos.OzoneAclInfo.newBuilder()
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
index 058adf3..b818a22 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
@@ -621,7 +621,7 @@ public class BucketManagerImpl implements BucketManager {
}
return hasAccess;
} catch (IOException ex) {
- if(ex instanceof OMException) {
+ if (ex instanceof OMException) {
throw (OMException) ex;
}
LOG.error("CheckAccess operation failed for bucket:{}/{}.",
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index b8857fd..639893a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -749,7 +749,7 @@ public class KeyManagerImpl implements KeyManager {
}
} catch (OMException ex) {
throw ex;
- } catch (IOException ex){
+ } catch (IOException ex) {
LOG.error(
"List Multipart Upload Parts Failed: volume: {}, bucket: {}, ,key: "
+ "{} ",
@@ -1071,7 +1071,7 @@ public class KeyManagerImpl implements KeyManager {
}
return hasAccess;
} catch (IOException ex) {
- if(ex instanceof OMException) {
+ if (ex instanceof OMException) {
throw (OMException) ex;
}
LOG.error("CheckAccess operation failed for key:{}/{}/{}", volume,
@@ -1763,7 +1763,7 @@ public class KeyManagerImpl implements KeyManager {
if (fileStatusInfo != null) {
prefixKeyInDB = fileStatusInfo.getKeyInfo().getParentObjectID();
- if(fileStatusInfo.isDirectory()){
+ if (fileStatusInfo.isDirectory()) {
seekDirInDB = metadataManager.getOzonePathKey(prefixKeyInDB,
fileStatusInfo.getKeyInfo().getFileName());
@@ -2005,7 +2005,7 @@ public class KeyManagerImpl implements KeyManager {
String cacheKey = entry.getKey().getCacheKey();
OmKeyInfo cacheOmKeyInfo = entry.getValue().getCacheValue();
// cacheOmKeyInfo is null if an entry is deleted in cache
- if(cacheOmKeyInfo == null){
+ if (cacheOmKeyInfo == null) {
deletedKeySet.add(cacheKey);
continue;
}
@@ -2050,7 +2050,7 @@ public class KeyManagerImpl implements KeyManager {
String cacheKey = entry.getKey().getCacheKey();
OmDirectoryInfo cacheOmDirInfo = entry.getValue().getCacheValue();
// cacheOmKeyInfo is null if an entry is deleted in cache
- if(cacheOmDirInfo == null){
+ if (cacheOmDirInfo == null) {
deletedKeySet.add(cacheKey);
continue;
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
index 69871fd..827727c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.metrics2.lib.MutableCounterLong;
* This class is for maintaining Ozone Manager statistics.
*/
@InterfaceAudience.Private
-@Metrics(about="Ozone Manager Metrics", context="dfs")
+@Metrics(about = "Ozone Manager Metrics", context = "dfs")
public class OMMetrics {
private static final String SOURCE_NAME =
OMMetrics.class.getSimpleName();
@@ -246,17 +246,17 @@ public class OMMetrics {
public void setNumKeys(long val) {
long oldVal = this.numKeys.value();
- this.numKeys.incr(val- oldVal);
+ this.numKeys.incr(val - oldVal);
}
public void setNumDirs(long val) {
long oldVal = this.numDirs.value();
- this.numDirs.incr(val- oldVal);
+ this.numDirs.incr(val - oldVal);
}
public void setNumFiles(long val) {
long oldVal = this.numDirs.value();
- this.numDirs.incr(val- oldVal);
+ this.numDirs.incr(val - oldVal);
}
public void decNumKeys(long val) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
index 81e1e09..c2dcb20 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -834,13 +834,13 @@ public class OmMetadataManagerImpl implements OMMetadataManager {
@Override
public Iterator<Map.Entry<CacheKey<String>, CacheValue<OmBucketInfo>>>
- getBucketIterator(){
+ getBucketIterator() {
return bucketTable.cacheIterator();
}
@Override
public TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
- getKeyIterator(){
+ getKeyIterator() {
return keyTable.iterator();
}
@@ -933,7 +933,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager {
// entries.
CacheValue<OmKeyInfo> cacheValue =
keyTable.getCacheValue(new CacheKey<>(kv.getKey()));
- if(cacheValue == null || cacheValue.getCacheValue() != null) {
+ if (cacheValue == null || cacheValue.getCacheValue() != null) {
cacheKeyMap.put(kv.getKey(), kv.getValue());
currentCount++;
}
@@ -1105,7 +1105,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager {
if (kv != null) {
RepeatedOmKeyInfo infoList = kv.getValue();
// Get block keys as a list.
- for(OmKeyInfo info : infoList.getOmKeyInfoList()){
+ for (OmKeyInfo info : infoList.getOmKeyInfoList()) {
OmKeyLocationInfoGroup latest = info.getLatestVersionLocations();
List<BlockID> item = latest.getLocationList().stream()
.map(b -> new BlockID(b.getContainerID(), b.getLocalID()))
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneAclUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneAclUtils.java
index e7834db..7c32258 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneAclUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneAclUtils.java
@@ -63,7 +63,7 @@ public final class OzoneAclUtils {
//OzoneNativeAuthorizer differs from Ranger Authorizer as Ranger requires
// only READ access on parent level access. OzoneNativeAuthorizer has
// different parent level access based on the child level access type
- if(ozoneManager.isNativeAuthorizerEnabled()) {
+ if (ozoneManager.isNativeAuthorizerEnabled()) {
if (aclType == IAccessAuthorizer.ACLType.CREATE ||
aclType == IAccessAuthorizer.ACLType.DELETE ||
aclType == IAccessAuthorizer.ACLType.WRITE_ACL) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 900babd..e2715af 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -2379,11 +2379,11 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
if (!accessAuthorizer.checkAccess(obj, context)) {
if (throwIfPermissionDenied) {
- String volumeName = obj.getVolumeName() != null?
- "Volume:" + obj.getVolumeName() + " ": "";
- String bucketName = obj.getBucketName() != null?
- "Bucket:" + obj.getBucketName() + " ": "";
- String keyName = obj.getKeyName() != null?
+ String volumeName = obj.getVolumeName() != null ?
+ "Volume:" + obj.getVolumeName() + " " : "";
+ String bucketName = obj.getBucketName() != null ?
+ "Bucket:" + obj.getBucketName() + " " : "";
+ String keyName = obj.getKeyName() != null ?
"Key:" + obj.getKeyName() : "";
LOG.warn("User {} doesn't have {} permission to access {} {}{}{}",
context.getClientUgi().getUserName(), context.getAclRights(),
@@ -3711,7 +3711,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
// Commit to DB.
- try(BatchOperation batchOperation =
+ try (BatchOperation batchOperation =
metadataManager.getStore().initBatchOperation()) {
metadataManager.getVolumeTable().putWithBatch(batchOperation,
dbVolumeKey, omVolumeArgs);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerPrepareState.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerPrepareState.java
index 130ce4d..2ffb388 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerPrepareState.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerPrepareState.java
@@ -182,7 +182,7 @@ public final class OzoneManagerPrepareState {
File prepareMarkerFile = getPrepareMarkerFile();
if (prepareMarkerFile.exists()) {
byte[] data = new byte[(int) prepareMarkerFile.length()];
- try(FileInputStream stream = new FileInputStream(prepareMarkerFile)) {
+ try (FileInputStream stream = new FileInputStream(prepareMarkerFile)) {
stream.read(data);
} catch (IOException e) {
throwPrepareException(e, "Failed to read prepare marker " +
@@ -255,7 +255,7 @@ public final class OzoneManagerPrepareState {
File parentDir = markerFile.getParentFile();
Files.createDirectories(parentDir.toPath());
- try(FileOutputStream stream = new FileOutputStream(markerFile)) {
+ try (FileOutputStream stream = new FileOutputStream(markerFile)) {
stream.write(Long.toString(index).getBytes(StandardCharsets.UTF_8));
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java
index ac2091f..8a22bff 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java
@@ -178,7 +178,7 @@ public class OzoneManagerStarter extends GenericCli {
* to execute its tasks. This allows the dependency to be injected for unit
* testing.
*/
- static class OMStarterHelper implements OMStarterInterface{
+ static class OMStarterHelper implements OMStarterInterface {
@Override
public void start(OzoneConfiguration conf) throws IOException,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java
index 57d17cd..634968a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java
@@ -65,7 +65,7 @@ public class S3SecretManagerImpl implements S3SecretManager {
try {
S3SecretValue s3Secret =
omMetadataManager.getS3SecretTable().get(kerberosID);
- if(s3Secret == null) {
+ if (s3Secret == null) {
byte[] secret = OmUtils.getSHADigest();
result = new S3SecretValue(kerberosID, DigestUtils.sha256Hex(secret));
omMetadataManager.getS3SecretTable().put(kerberosID, result);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
index 92b7691..68d3814 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashOzoneFileSystem.java
@@ -135,7 +135,7 @@ public class TrashOzoneFileSystem extends FileSystem {
public FSDataOutputStream create(Path path,
FsPermission fsPermission,
boolean b, int i, short i1,
- long l, Progressable progressable){
+ long l, Progressable progressable) {
throw new UnsupportedOperationException(
"fs.create() not implemented in TrashOzoneFileSystem");
}
@@ -173,12 +173,12 @@ public class TrashOzoneFileSystem extends FileSystem {
OzoneManagerProtocolProtos.OMRequest omRequest =
getRenameKeyRequest(srcPath, dstPath);
try {
- if(omRequest != null) {
+ if (omRequest != null) {
submitRequest(omRequest);
return true;
}
return false;
- } catch (Exception e){
+ } catch (Exception e) {
LOG.error("Couldn't send rename request", e);
return false;
}
@@ -203,7 +203,7 @@ public class TrashOzoneFileSystem extends FileSystem {
OzoneManagerProtocolProtos.OMRequest omRequest =
getDeleteKeyRequest(srcPath);
try {
- if(omRequest != null) {
+ if (omRequest != null) {
submitRequest(omRequest);
return true;
}
@@ -299,7 +299,7 @@ public class TrashOzoneFileSystem extends FileSystem {
CacheValue<OmBucketInfo>>> bucketIterator =
ozoneManager.getMetadataManager().getBucketIterator();
List<FileStatus> ret = new ArrayList<>();
- while (bucketIterator.hasNext()){
+ while (bucketIterator.hasNext()) {
Map.Entry<CacheKey<String>, CacheValue<OmBucketInfo>> entry =
bucketIterator.next();
OmBucketInfo omBucketInfo = entry.getValue().getCacheValue();
@@ -316,7 +316,7 @@ public class TrashOzoneFileSystem extends FileSystem {
}
}
}
- } catch (Exception e){
+ } catch (Exception e) {
LOG.error("Couldn't perform fs operation " +
"fs.listStatus()/fs.exists()", e);
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java
index d8bc270..e1138af 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java
@@ -70,7 +70,7 @@ public class TrashPolicyOzone extends TrashPolicyDefault {
/** Format of checkpoint directories used prior to Hadoop 0.23. */
private static final DateFormat OLD_CHECKPOINT =
new SimpleDateFormat("yyMMddHHmm");
- private static final int MSECS_PER_MINUTE = 60*1000;
+ private static final int MSECS_PER_MINUTE = 60 * 1000;
private long emptierInterval;
@@ -78,7 +78,7 @@ public class TrashPolicyOzone extends TrashPolicyDefault {
private OzoneManager om;
- public TrashPolicyOzone(){
+ public TrashPolicyOzone() {
}
@Override
@@ -110,7 +110,7 @@ public class TrashPolicyOzone extends TrashPolicyDefault {
}
}
- TrashPolicyOzone(FileSystem fs, Configuration conf, OzoneManager om){
+ TrashPolicyOzone(FileSystem fs, Configuration conf, OzoneManager om) {
initialize(conf, fs);
this.om = om;
}
@@ -198,7 +198,7 @@ public class TrashPolicyOzone extends TrashPolicyDefault {
// sleep for interval
Thread.sleep(end - now);
// if not leader, thread will always be sleeping
- if (!om.isLeaderReady()){
+ if (!om.isLeaderReady()) {
continue;
}
} catch (InterruptedException e) {
@@ -219,7 +219,7 @@ public class TrashPolicyOzone extends TrashPolicyDefault {
continue;
}
TrashPolicyOzone trash = new TrashPolicyOzone(fs, conf, om);
- Runnable task = ()->{
+ Runnable task = () -> {
try {
om.getMetrics().incNumTrashRootsProcessed();
trash.deleteCheckpoint(trashRoot.getPath(), false);
@@ -241,7 +241,7 @@ public class TrashPolicyOzone extends TrashPolicyDefault {
}
try {
fs.close();
- } catch(IOException e) {
+ } catch (IOException e) {
LOG.warn("Trash cannot close FileSystem: ", e);
} finally {
executor.shutdown();
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
index e3ab5bd..eaa38ef 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
@@ -243,7 +243,7 @@ public final class OzoneManagerDoubleBuffer {
setReadyBuffer();
List<Long> flushedEpochs = null;
- try(BatchOperation batchOperation = omMetadataManager.getStore()
+ try (BatchOperation batchOperation = omMetadataManager.getStore()
.initBatchOperation()) {
AtomicReference<String> lastTraceId = new AtomicReference<>();
@@ -376,7 +376,7 @@ public final class OzoneManagerDoubleBuffer {
responseClass.getAnnotation(CleanupTableInfo.class);
if (cleanupTableInfo != null) {
String[] cleanupTables;
- if (cleanupTableInfo.cleanupAll()){
+ if (cleanupTableInfo.cleanupAll()) {
cleanupTables = Arrays
.stream(new OMDBDefinition().getColumnFamilies())
.map(DBColumnFamilyDefinition::getTableName)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
index 1b7dc46..e45c52c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
@@ -311,7 +311,7 @@ public class OzoneManagerStateMachine extends BaseStateMachine {
CompletableFuture<OMResponse> future = CompletableFuture.supplyAsync(
() -> runCommand(request, trxLogIndex), executorService);
future.thenApply(omResponse -> {
- if(!omResponse.getSuccess()) {
+ if (!omResponse.getSuccess()) {
// When INTERNAL_ERROR or METADATA_ERROR it is considered as
// critical error and terminate the OM. Considering INTERNAL_ERROR
// also for now because INTERNAL_ERROR is thrown for any error
@@ -516,8 +516,8 @@ public class OzoneManagerStateMachine extends BaseStateMachine {
*/
public void updateLastAppliedIndex(List<Long> flushedEpochs) {
Preconditions.checkArgument(flushedEpochs.size() > 0);
- computeAndUpdateLastAppliedIndex(flushedEpochs.get(flushedEpochs.size() -1),
- -1L, flushedEpochs, true);
+ computeAndUpdateLastAppliedIndex(
+ flushedEpochs.get(flushedEpochs.size() - 1), -1L, flushedEpochs, true);
}
/**
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
index a4ef4a1..6d9ce34 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
@@ -155,7 +155,7 @@ public abstract class OMClientRequest implements RequestAuditor {
public OzoneManagerProtocolProtos.UserInfo getUserIfNotExists(
OzoneManager ozoneManager) {
OzoneManagerProtocolProtos.UserInfo userInfo = getUserInfo();
- if (!userInfo.hasRemoteAddress() || !userInfo.hasUserName()){
+ if (!userInfo.hasRemoteAddress() || !userInfo.hasUserName()) {
OzoneManagerProtocolProtos.UserInfo.Builder newuserInfo =
OzoneManagerProtocolProtos.UserInfo.newBuilder();
UserGroupInformation user;
@@ -164,7 +164,7 @@ public abstract class OMClientRequest implements RequestAuditor {
user = UserGroupInformation.getCurrentUser();
remoteAddress = ozoneManager.getOmRpcServerAddr()
.getAddress();
- } catch (Exception e){
+ } catch (Exception e) {
LOG.debug("Couldn't get om Rpc server address", e);
return getUserInfo();
}
@@ -517,7 +517,7 @@ public abstract class OMClientRequest implements RequestAuditor {
if (path.length() == 0) {
throw new OMException("Invalid KeyPath, empty keyName" + path,
INVALID_KEY_NAME);
- } else if(path.startsWith("/")) {
+ } else if (path.startsWith("/")) {
isValid = false;
} else {
// Check for ".." "." ":" "/"
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
index b3acaaa..b90e104 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
@@ -336,13 +336,13 @@ public class OMBucketCreateRequest extends OMClientRequest {
List<OmBucketInfo> bucketList = metadataManager.listBuckets(
omVolumeArgs.getVolume(), null, null, Integer.MAX_VALUE);
- for(OmBucketInfo bucketInfo : bucketList) {
+ for (OmBucketInfo bucketInfo : bucketList) {
long nextQuotaInBytes = bucketInfo.getQuotaInBytes();
- if(nextQuotaInBytes > OzoneConsts.QUOTA_RESET) {
+ if (nextQuotaInBytes > OzoneConsts.QUOTA_RESET) {
totalBucketQuota += nextQuotaInBytes;
}
}
- if(volumeQuotaInBytes < totalBucketQuota
+ if (volumeQuotaInBytes < totalBucketQuota
&& volumeQuotaInBytes != OzoneConsts.QUOTA_RESET) {
throw new IllegalArgumentException("Total buckets quota in this volume " +
"should not be greater than volume quota : the total space quota is" +
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java
index 44c3756..17c4e39 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java
@@ -267,15 +267,15 @@ public class OMBucketSetPropertyRequest extends OMClientRequest {
}
List<OmBucketInfo> bucketList = metadataManager.listBuckets(
omVolumeArgs.getVolume(), null, null, Integer.MAX_VALUE);
- for(OmBucketInfo bucketInfo : bucketList) {
+ for (OmBucketInfo bucketInfo : bucketList) {
long nextQuotaInBytes = bucketInfo.getQuotaInBytes();
- if(nextQuotaInBytes > OzoneConsts.QUOTA_RESET &&
+ if (nextQuotaInBytes > OzoneConsts.QUOTA_RESET &&
!omBucketArgs.getBucketName().equals(bucketInfo.getBucketName())) {
totalBucketQuota += nextQuotaInBytes;
}
}
- if(volumeQuotaInBytes < totalBucketQuota &&
+ if (volumeQuotaInBytes < totalBucketQuota &&
volumeQuotaInBytes != OzoneConsts.QUOTA_RESET) {
throw new OMException("Total buckets quota in this volume " +
"should not be greater than volume quota : the total space quota is" +
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java
index d4ba017..5d01c4f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java
@@ -120,7 +120,7 @@ public class OMBucketSetAclRequest extends OMBucketAclRequest {
@Override
void onComplete(boolean operationResult, IOException exception,
OMMetrics omMetrics, AuditLogger auditLogger,
- Map<String, String> auditMap){
+ Map<String, String> auditMap) {
auditLog(auditLogger, buildAuditMessage(OMAction.SET_ACL, auditMap,
exception, getOmRequest().getUserInfo()));
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
index e197cca..48d4274 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
@@ -193,7 +193,7 @@ public class OMDirectoryCreateRequest extends OMKeyRequest {
OmKeyInfo dirKeyInfo = null;
if (omDirectoryResult == FILE_EXISTS ||
omDirectoryResult == FILE_EXISTS_IN_GIVENPATH) {
- throw new OMException("Unable to create directory: " +keyName
+ throw new OMException("Unable to create directory: " + keyName
+ " in volume/bucket: " + volumeName + "/" + bucketName,
FILE_ALREADY_EXISTS);
} else if (omDirectoryResult == DIRECTORY_EXISTS_IN_GIVENPATH ||
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
index 4e19b99..24994d7 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
@@ -97,7 +97,7 @@ public class OMFileCreateRequest extends OMKeyRequest {
final boolean checkKeyNameEnabled = ozoneManager.getConfiguration()
.getBoolean(OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_KEY,
OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_DEFAULT);
- if(checkKeyNameEnabled){
+ if (checkKeyNameEnabled) {
OmUtils.validateKeyName(StringUtils.removeEnd(keyArgs.getKeyName(),
OzoneConsts.FS_FILE_COPYING_TEMP_SUFFIX));
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
index 9f05fee..f46b2dd 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
@@ -199,7 +199,7 @@ public final class OMFileRequest {
// Add all the sub-dirs to the missing list except the leaf element.
// For example, /vol1/buck1/a/b/c/d/e/f/file1.txt.
// Assume /vol1/buck1/a/b/c exists, then add d, e, f into missing list.
- if(elements.hasNext()){
+ if (elements.hasNext()) {
// skips leaf node.
missing.add(fileName);
}
@@ -273,7 +273,7 @@ public final class OMFileRequest {
* Includes the list of missing intermediate directories and
* the directory search result code.
*/
- public static class OMPathInfoWithFSO extends OMPathInfo{
+ public static class OMPathInfoWithFSO extends OMPathInfo {
private String leafNodeName;
private long lastKnownParentId;
private long leafNodeObjectId;
@@ -759,7 +759,7 @@ public final class OMFileRequest {
* @param keyInfo omKeyInfo
* @return omDirectoryInfo object
*/
- public static OmDirectoryInfo getDirectoryInfo(OmKeyInfo keyInfo){
+ public static OmDirectoryInfo getDirectoryInfo(OmKeyInfo keyInfo) {
OmDirectoryInfo.Builder builder = new OmDirectoryInfo.Builder();
builder.setParentObjectID(keyInfo.getParentObjectID());
builder.setAcls(keyInfo.getAcls());
@@ -838,7 +838,7 @@ public final class OMFileRequest {
"Failed to rename %s to %s, %s doesn't exist", fromKeyName,
toKeyName, toKeyParentDir),
OMException.ResultCodes.KEY_RENAME_ERROR);
- } else if (toKeyParentDirStatus.isFile()){
+ } else if (toKeyParentDirStatus.isFile()) {
throw new OMException(String.format(
"Failed to rename %s to %s, %s is a file", fromKeyName, toKeyName,
toKeyParentDir), OMException.ResultCodes.KEY_RENAME_ERROR);
@@ -975,7 +975,7 @@ public final class OMFileRequest {
long lastKnownParentId = bucketId;
// If no sub-dirs then bucketID is the root/parent.
- if(!pathComponents.hasNext()){
+ if (!pathComponents.hasNext()) {
return bucketId;
}
if (StringUtils.isBlank(errMsg)) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
index 9a2ac61..9bdb51f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
@@ -88,7 +88,7 @@ public class OMKeyCommitRequest extends OMKeyRequest {
final boolean checkKeyNameEnabled = ozoneManager.getConfiguration()
.getBoolean(OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_KEY,
OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_DEFAULT);
- if(checkKeyNameEnabled){
+ if (checkKeyNameEnabled) {
OmUtils.validateKeyName(StringUtils.removeEnd(keyArgs.getKeyName(),
OzoneConsts.FS_FILE_COPYING_TEMP_SUFFIX));
}
@@ -265,7 +265,7 @@ public class OMKeyCommitRequest extends OMKeyRequest {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
- if(bucketLockAcquired) {
+ if (bucketLockAcquired) {
omMetadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
index 50d9e4c..ffa3ebf 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
@@ -98,7 +98,7 @@ public class OMKeyCreateRequest extends OMKeyRequest {
final boolean checkKeyNameEnabled = ozoneManager.getConfiguration()
.getBoolean(OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_KEY,
OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_DEFAULT);
- if(checkKeyNameEnabled){
+ if (checkKeyNameEnabled) {
OmUtils.validateKeyName(keyArgs.getKeyName());
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
index 99ca308..0c96756 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
@@ -88,7 +88,7 @@ public class OMKeyRenameRequest extends OMKeyRequest {
final boolean checkKeyNameEnabled = ozoneManager.getConfiguration()
.getBoolean(OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_KEY,
OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_DEFAULT);
- if(checkKeyNameEnabled){
+ if (checkKeyNameEnabled) {
OmUtils.validateKeyName(renameKeyRequest.getToKeyName());
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
index 2235baf..f9c67d6 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
@@ -149,7 +149,7 @@ public class OMKeyRenameRequestWithFSO extends OMKeyRenameRequest {
volumeName, bucketName, toKeyName, 0);
// Check if toKey exists.
- if(toKeyFileStatus != null) {
+ if (toKeyFileStatus != null) {
// Destination exists and following are different cases:
OmKeyInfo toKeyValue = toKeyFileStatus.getKeyInfo();
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
index b4528b8..8fe9011 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
@@ -259,22 +259,22 @@ public abstract class OMKeyRequest extends OMClientRequest {
OmBucketInfo bucketInfo, PrefixManager prefixManager) {
List<OzoneAcl> acls = new ArrayList<>();
- if(keyArgs.getAclsList() != null) {
+ if (keyArgs.getAclsList() != null) {
acls.addAll(OzoneAclUtil.fromProtobuf(keyArgs.getAclsList()));
}
// Inherit DEFAULT acls from prefix.
- if(prefixManager != null) {
+ if (prefixManager != null) {
List< OmPrefixInfo > prefixList = prefixManager.getLongestPrefixPath(
OZONE_URI_DELIMITER +
keyArgs.getVolumeName() + OZONE_URI_DELIMITER +
keyArgs.getBucketName() + OZONE_URI_DELIMITER +
keyArgs.getKeyName());
- if(prefixList.size() > 0) {
+ if (prefixList.size() > 0) {
// Add all acls from direct parent to key.
OmPrefixInfo prefixInfo = prefixList.get(prefixList.size() - 1);
- if(prefixInfo != null) {
+ if (prefixInfo != null) {
if (OzoneAclUtil.inheritDefaultAcls(acls, prefixInfo.getAcls())) {
return acls;
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
index 4a45ef9..0fe8925 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
@@ -112,7 +112,8 @@ public abstract class OMKeyAclRequest extends OMClientRequest {
if (getOmRequest().getAddAclRequest().hasObj() && operationResult) {
modificationTime = getOmRequest().getAddAclRequest()
.getModificationTime();
- } else if (getOmRequest().getSetAclRequest().hasObj() && operationResult){
+ } else if (getOmRequest().getSetAclRequest().hasObj()
+ && operationResult) {
modificationTime = getOmRequest().getSetAclRequest()
.getModificationTime();
} else if (getOmRequest().getRemoveAclRequest().hasObj()
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java
index 21d10c4..b7cf656 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java
@@ -168,7 +168,7 @@ public class S3MultipartUploadAbortRequest extends OMKeyRequest {
int keyFactor = omKeyInfo.getReplicationConfig().getRequiredNodes();
Iterator iter =
multipartKeyInfo.getPartKeyInfoMap().entrySet().iterator();
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
Map.Entry entry = (Map.Entry)iter.next();
PartKeyInfo iterPartKeyInfo = (PartKeyInfo)entry.getValue();
quotaReleased +=
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
index 26d9627..d8848fc 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
@@ -197,13 +197,13 @@ public class OMVolumeSetQuotaRequest extends OMVolumeRequest {
List<OmBucketInfo> bucketList = metadataManager.listBuckets(
volumeName, null, null, Integer.MAX_VALUE);
- for(OmBucketInfo bucketInfo : bucketList) {
+ for (OmBucketInfo bucketInfo : bucketList) {
long nextQuotaInBytes = bucketInfo.getQuotaInBytes();
- if(nextQuotaInBytes > OzoneConsts.QUOTA_RESET) {
+ if (nextQuotaInBytes > OzoneConsts.QUOTA_RESET) {
totalBucketQuota += nextQuotaInBytes;
}
}
- if(volumeQuotaInBytes < totalBucketQuota &&
+ if (volumeQuotaInBytes < totalBucketQuota &&
volumeQuotaInBytes != OzoneConsts.QUOTA_RESET) {
throw new OMException("Total buckets quota in this volume " +
"should not be greater than volume quota : the total space quota is" +
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAclRequest.java
index b91aef8..ce1a4d0 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAclRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAclRequest.java
@@ -102,7 +102,7 @@ public abstract class OMVolumeAclRequest extends OMVolumeRequest {
if (getOmRequest().getAddAclRequest().hasObj()) {
modificationTime = getOmRequest().getAddAclRequest()
.getModificationTime();
- } else if (getOmRequest().getSetAclRequest().hasObj()){
+ } else if (getOmRequest().getSetAclRequest().hasObj()) {
modificationTime = getOmRequest().getSetAclRequest()
.getModificationTime();
} else if (getOmRequest().getRemoveAclRequest().hasObj()) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAddAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAddAclRequest.java
index 8df7792..e776df0 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAddAclRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeAddAclRequest.java
@@ -110,7 +110,7 @@ public class OMVolumeAddAclRequest extends OMVolumeAclRequest {
@Override
OMClientResponse onSuccess(OMResponse.Builder omResponse,
- OmVolumeArgs omVolumeArgs, boolean aclApplied){
+ OmVolumeArgs omVolumeArgs, boolean aclApplied) {
omResponse.setAddAclResponse(OzoneManagerProtocolProtos.AddAclResponse
.newBuilder().setResponse(aclApplied).build());
return new OMVolumeAclOpResponse(omResponse.build(), omVolumeArgs);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeRemoveAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeRemoveAclRequest.java
index 4ab55f3..ff2792d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeRemoveAclRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeRemoveAclRequest.java
@@ -110,7 +110,7 @@ public class OMVolumeRemoveAclRequest extends OMVolumeAclRequest {
@Override
OMClientResponse onSuccess(OMResponse.Builder omResponse,
- OmVolumeArgs omVolumeArgs, boolean aclApplied){
+ OmVolumeArgs omVolumeArgs, boolean aclApplied) {
omResponse.setRemoveAclResponse(OzoneManagerProtocolProtos.RemoveAclResponse
.newBuilder().setResponse(aclApplied).build());
return new OMVolumeAclOpResponse(omResponse.build(), omVolumeArgs);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeSetAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeSetAclRequest.java
index 7102509..95d98f4 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeSetAclRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/acl/OMVolumeSetAclRequest.java
@@ -107,7 +107,7 @@ public class OMVolumeSetAclRequest extends OMVolumeAclRequest {
@Override
OMClientResponse onSuccess(OMResponse.Builder omResponse,
- OmVolumeArgs omVolumeArgs, boolean aclApplied){
+ OmVolumeArgs omVolumeArgs, boolean aclApplied) {
omResponse.setSetAclResponse(OzoneManagerProtocolProtos.SetAclResponse
.newBuilder().setResponse(aclApplied).build());
return new OMVolumeAclOpResponse(omResponse.build(), omVolumeArgs);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
index 5d34f6a..10dda29 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
@@ -404,7 +404,7 @@ public class OzoneDelegationTokenSecretManager
@Override
public byte[] retrievePassword(OzoneTokenIdentifier identifier)
throws InvalidToken {
- if(identifier.getTokenType().equals(S3AUTHINFO)) {
+ if (identifier.getTokenType().equals(S3AUTHINFO)) {
return validateS3AuthInfo(identifier);
}
return validateToken(identifier).getPassword();
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneSecretStore.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneSecretStore.java
index 756e821..fb348fd 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneSecretStore.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneSecretStore.java
@@ -102,9 +102,9 @@ public class OzoneSecretStore implements Closeable {
int loadedToken = 0;
try (TableIterator<OzoneTokenIdentifier, ? extends
KeyValue<OzoneTokenIdentifier, Long>> iterator =
- omMetadataManager.getDelegationTokenTable().iterator()){
+ omMetadataManager.getDelegationTokenTable().iterator()) {
iterator.seekToFirst();
- while(iterator.hasNext()) {
+ while (iterator.hasNext()) {
KeyValue<OzoneTokenIdentifier, Long> kv = iterator.next();
state.tokenState.put(kv.getKey(), kv.getValue());
loadedToken++;
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
index 6a2cf58..cfeab4b 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
@@ -208,7 +208,7 @@ public class TestKeyManagerUnit {
initMultipartUpload(writeClient, volume, bucket, "dir/ozonekey2");
- OmMultipartInfo omMultipartInfo3 =addinitMultipartUploadToCache(volume,
... 1667 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org