This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch HDDS-4440-s3-performance in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 0de099dbdebc602fa0630bb17c439388a00b2844 Merge: 2522127b1c 666525e386 Author: Doroszlai, Attila <[email protected]> AuthorDate: Mon Apr 11 19:13:25 2022 +0200 Merge remote-tracking branch 'neils-dev/merge-master-s3g' into HDDS-4440-s3-performance .github/workflows/post-commit.yml | 6 + .gitignore | 3 +- CONTRIBUTING.md | 3 +- dev-support/ci/selective_ci_checks.bats | 24 +- dev-support/ci/selective_ci_checks.sh | 21 +- .../apache/hadoop/hdds/scm/XceiverClientGrpc.java | 8 +- .../hadoop/hdds/scm/client/HddsClientUtils.java | 4 +- .../hadoop/hdds/scm/storage/BlockInputStream.java | 8 +- .../hadoop/hdds/scm/storage/BlockOutputStream.java | 6 +- .../apache/hadoop/hdds/scm/storage/BufferPool.java | 2 +- .../hdds/scm/storage/RatisBlockOutputStream.java | 2 +- hadoop-hdds/common/pom.xml | 15 + .../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 | 9 +- .../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 | 8 +- .../apache/hadoop/hdds/scm/client/ScmClient.java | 24 +- .../hdds/scm/container/ContainerReplicaInfo.java | 129 +++ .../scm/container/ReplicationManagerReport.java | 283 +++++++ .../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 +- .../protocol/StorageContainerLocationProtocol.java | 24 +- .../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 | 13 +- .../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 +- .../org/apache/hadoop/ozone/audit/SCMAction.java | 3 +- .../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 +- .../common/src/main/resources/ozone-default.xml | 59 +- .../java/org/apache/hadoop/hdds/TestHddsUtils.java | 4 +- .../hadoop/hdds/client/TestReplicationConfig.java | 2 +- .../hadoop/hdds/conf/TestOzoneConfiguration.java | 28 + .../java/org/apache/hadoop/hdds/fs/TestDU.java | 2 +- .../ratis/TestContainerCommandRequestMessage.java | 6 +- .../scm/container/TestContainerReplicaInfo.java | 59 ++ .../container/TestReplicationManagerReport.java | 162 ++++ .../hadoop/hdds/scm/container/package-info.java | 21 + .../apache/hadoop/hdds/scm/ha/TestSCMNodeInfo.java | 4 +- .../hdds/scm/net/TestNetworkTopologyImpl.java | 20 +- .../hadoop/hdds/scm/pipeline/MockPipeline.java | 2 +- .../hadoop/hdds/tracing/TestStringCodec.java | 18 +- .../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 +- ...TestUpgradeUtils.java => UpgradeTestUtils.java} | 4 +- .../apache/hadoop/ozone/HddsDatanodeService.java | 6 +- .../container/common/helpers/ContainerMetrics.java | 6 +- .../container/common/helpers/ContainerUtils.java | 2 +- .../common/helpers/DatanodeVersionFile.java | 8 +- .../ozone/container/common/impl/ContainerData.java | 19 +- .../container/common/impl/ContainerDataYaml.java | 11 +- ...OutVersion.java => ContainerLayoutVersion.java} | 34 +- .../container/common/impl/HddsDispatcher.java | 15 +- .../common/impl/OpenContainerBlockMap.java | 2 +- .../common/statemachine/DatanodeConfiguration.java | 34 +- .../common/statemachine/DatanodeStateMachine.java | 13 +- .../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 | 16 +- .../container/keyvalue/KeyValueContainerData.java | 10 +- .../ozone/container/keyvalue/KeyValueHandler.java | 12 +- .../helpers/KeyValueContainerLocationUtil.java | 2 +- .../container/keyvalue/impl/BlockManagerImpl.java | 8 +- .../keyvalue/impl/ChunkManagerDispatcher.java | 18 +- .../keyvalue/impl/FilePerBlockStrategy.java | 4 +- .../keyvalue/impl/FilePerChunkStrategy.java | 4 +- .../background/BlockDeletingService.java | 4 +- .../container/metadata/AbstractDatanodeStore.java | 2 +- .../container/ozoneimpl/ContainerController.java | 14 +- .../ozoneimpl/ContainerDataScrubberMetrics.java | 6 +- .../ozoneimpl/ContainerMetadataScanner.java | 2 +- .../ContainerMetadataScrubberMetrics.java | 2 +- .../replication/GrpcReplicationClient.java | 17 +- .../container/replication/ReplicationServer.java | 56 +- .../replication/ReplicationSupervisor.java | 8 + .../container/stream/DirstreamClientHandler.java | 2 +- .../upgrade/DataNodeUpgradeFinalizer.java | 2 +- .../upgrade/VersionedDatanodeFeatures.java | 2 +- .../ozone/protocol/commands/ReregisterCommand.java | 2 +- .../hadoop/ozone/TestHddsSecureDatanodeInit.java | 2 +- .../ozone/container/common/ContainerTestUtils.java | 4 +- .../hadoop/ozone/container/common/ScmTestMock.java | 35 +- .../container/common/TestBlockDeletingService.java | 20 +- .../ozone/container/common/TestContainerCache.java | 2 +- ...ersion.java => TestContainerLayoutVersion.java} | 12 +- .../common/TestKeyValueContainerData.java | 10 +- .../TestSchemaOneBackwardsCompatibility.java | 36 +- .../container/common/helpers/TestBlockData.java | 6 +- .../common/helpers/TestDatanodeVersionFile.java | 10 +- .../common/impl/TestContainerDataYaml.java | 18 +- .../impl/TestContainerDeletionChoosingPolicy.java | 8 +- .../common/impl/TestContainerPersistence.java | 8 +- .../container/common/impl/TestContainerSet.java | 20 +- .../container/common/impl/TestHddsDispatcher.java | 10 +- .../container/common/interfaces/TestHandler.java | 2 +- .../common/report/TestReportPublisher.java | 2 +- .../statemachine/TestDatanodeConfiguration.java | 11 - .../TestCloseContainerCommandHandler.java | 14 +- .../volume/TestRoundRobinVolumeChoosingPolicy.java | 2 +- .../common/volume/TestStorageVolumeChecker.java | 8 +- .../container/common/volume/TestVolumeSet.java | 2 +- ...tTestInfo.java => ContainerLayoutTestInfo.java} | 24 +- .../keyvalue/TestKeyValueBlockIterator.java | 24 +- .../container/keyvalue/TestKeyValueContainer.java | 18 +- .../keyvalue/TestKeyValueContainerCheck.java | 11 +- .../TestKeyValueContainerMarkUnhealthy.java | 8 +- .../container/keyvalue/TestKeyValueHandler.java | 12 +- .../container/keyvalue/TestTarContainerPacker.java | 8 +- .../keyvalue/impl/AbstractTestChunkManager.java | 8 +- .../keyvalue/impl/CommonChunkManagerTestCases.java | 4 +- .../keyvalue/impl/TestBlockManagerImpl.java | 10 +- .../keyvalue/impl/TestChunkManagerDummyImpl.java | 6 +- .../keyvalue/impl/TestFilePerBlockStrategy.java | 6 +- .../keyvalue/impl/TestFilePerChunkStrategy.java | 12 +- .../container/ozoneimpl/TestContainerReader.java | 16 +- .../container/ozoneimpl/TestOzoneContainer.java | 10 +- .../replication/TestGrpcOutputStream.java | 8 +- .../replication/TestReplicationConfig.java | 75 ++ .../replication/TestReplicationSupervisor.java | 12 +- .../upgrade/TestDataNodeStartupSlvLessThanMlv.java | 4 +- .../upgrade/TestDatanodeUpgradeToScmHA.java | 6 +- hadoop-hdds/dev-support/checkstyle/checkstyle.xml | 1 + hadoop-hdds/docs/content/feature/Observability.md | 2 +- .../{Observability.md => Observability.zh.md} | 63 +- hadoop-hdds/docs/content/security/SecuringTDE.md | 48 +- .../docs/content/security/SecuringTDE.zh.md | 4 +- hadoop-hdds/docs/content/tools/TestTools.md | 129 +-- hadoop-hdds/docs/content/tools/TestTools.zh.md | 129 +-- hadoop-hdds/docs/content/tools/_index.md | 1 - hadoop-hdds/docs/content/tools/_index.zh.md | 1 - .../themes/ozonedoc/layouts/shortcodes/image.html | 2 +- .../SCMSecurityProtocolClientSideTranslatorPB.java | 2 +- ...inerLocationProtocolClientSideTranslatorPB.java | 90 +- .../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 +- .../org/apache/hadoop/hdds/utils/db/DBStore.java | 10 + .../hadoop/hdds/utils/db/DBStoreBuilder.java | 4 +- .../org/apache/hadoop/hdds/utils/db/RDBStore.java | 11 + .../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 | 48 +- .../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 +- .../src/main/proto/ScmAdminProtocol.proto | 40 +- .../interface-client/src/main/proto/hdds.proto | 25 + hadoop-hdds/server-scm/pom.xml | 10 - .../hadoop/hdds/scm/block/DeletedBlockLogImpl.java | 2 +- .../hdds/scm/container/ContainerReplicaCount.java | 28 +- .../hdds/scm/container/ContainerReportHandler.java | 2 +- .../hdds/scm/container/ReplicationManager.java | 91 +- .../balancer/AbstractFindTargetGreedy.java | 6 +- .../scm/container/balancer/ContainerBalancer.java | 51 +- .../balancer/ContainerBalancerConfiguration.java | 131 +-- .../scm/container/balancer/FindSourceGreedy.java | 6 +- .../ContainerPlacementPolicyFactory.java | 2 +- .../algorithms/SCMContainerPlacementMetrics.java | 2 +- .../algorithms/SCMContainerPlacementRackAware.java | 12 +- .../container/placement/metrics/SCMMetrics.java | 2 +- .../replication/ReplicationManagerMetrics.java | 42 + .../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 | 9 +- .../hadoop/hdds/scm/ha/SCMHAManagerImpl.java | 35 +- .../hadoop/hdds/scm/ha/SCMRatisServerImpl.java | 3 +- .../apache/hadoop/hdds/scm/ha/SCMStateMachine.java | 6 +- .../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 +- .../scm/pipeline/PipelineStateManagerImpl.java | 7 +- .../hdds/scm/pipeline/RatisPipelineUtils.java | 2 +- .../scm/pipeline/WritableContainerFactory.java | 2 +- ...inerLocationProtocolServerSideTranslatorPB.java | 86 +- .../hdds/scm/safemode/ContainerSafeModeRule.java | 4 +- .../hdds/scm/safemode/DataNodeSafeModeRule.java | 2 +- .../hdds/scm/server/SCMBlockProtocolServer.java | 16 +- .../hdds/scm/server/SCMClientProtocolServer.java | 90 +- .../hdds/scm/server/SCMDatanodeProtocolServer.java | 6 +- .../hdds/scm/server/StorageContainerManager.java | 12 +- .../server/StorageContainerManagerHttpServer.java | 4 +- .../scm/server/StorageContainerManagerStarter.java | 2 +- .../org/apache/hadoop/hdds/scm/HddsTestUtils.java | 692 +++++++++++++++- .../apache/hadoop/hdds/scm/TestHddsServerUtil.java | 2 +- .../hadoop/hdds/scm/TestHddsServerUtils.java | 2 +- .../java/org/apache/hadoop/hdds/scm/TestUtils.java | 699 ---------------- .../hadoop/hdds/scm/block/TestBlockManager.java | 22 +- .../hadoop/hdds/scm/block/TestDeletedBlockLog.java | 4 +- .../command/TestCommandStatusReportHandler.java | 4 +- .../hadoop/hdds/scm/container/MockNodeManager.java | 12 +- .../hdds/scm/container/SimpleMockNodeManager.java | 2 +- .../container/TestCloseContainerEventHandler.java | 4 +- .../scm/container/TestContainerManagerImpl.java | 6 +- .../scm/container/TestContainerReportHandler.java | 4 +- .../TestIncrementalContainerReportHandler.java | 8 +- .../hdds/scm/container/TestReplicationManager.java | 165 +++- .../scm/container/TestUnknownContainerReport.java | 2 +- .../container/balancer/TestContainerBalancer.java | 123 ++- .../algorithms/TestContainerPlacementFactory.java | 12 +- .../TestSCMContainerPlacementCapacity.java | 12 +- .../TestSCMContainerPlacementRackAware.java | 24 +- .../TestSCMContainerPlacementRandom.java | 16 +- .../replication/TestReplicationManagerMetrics.java | 97 +++ .../states/TestContainerReplicaCount.java | 10 + .../hdds/scm/crl/TestCRLStatusReportHandler.java | 4 +- .../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 | 8 +- .../hdds/scm/node/TestDatanodeAdminMonitor.java | 4 +- .../hadoop/hdds/scm/node/TestDeadNodeHandler.java | 43 +- .../hdds/scm/node/TestNodeDecommissionManager.java | 16 +- .../hdds/scm/node/TestNodeReportHandler.java | 10 +- .../hadoop/hdds/scm/node/TestNodeStateManager.java | 2 +- .../hadoop/hdds/scm/node/TestSCMNodeManager.java | 82 +- .../hdds/scm/node/TestSCMNodeStorageStatMap.java | 15 +- .../hadoop/hdds/scm/node/TestStatisticsUpdate.java | 16 +- .../hdds/scm/node/states/TestNodeStateMap.java | 4 +- .../TestPipelineDatanodesIntersection.java | 4 +- .../hdds/scm/pipeline/TestPipelineManagerImpl.java | 11 +- .../scm/pipeline/TestPipelinePlacementPolicy.java | 16 +- .../scm/pipeline/TestRatisPipelineProvider.java | 4 +- .../TestOneReplicaPipelineSafeModeRule.java | 8 +- .../hdds/scm/safemode/TestSCMSafeModeManager.java | 8 +- .../scm/server/TestSCMBlockProtocolServer.java | 4 +- .../hadoop/hdds/scm/server/TestSCMCertStore.java | 6 +- .../server/TestSCMUpdateServiceGrpcServer.java | 24 +- .../TestSCMHAUnfinalizedStateValidationAction.java | 5 +- .../scm/upgrade/TestScmStartupSlvLessThanMlv.java | 6 +- .../ozone/container/common/TestEndPoint.java | 23 +- .../testutils/ReplicationNodeManagerMock.java | 2 +- .../hadoop/ozone/scm/node/TestSCMNodeMetrics.java | 11 +- .../org/apache/ozone/test/LambdaTestUtils.java | 4 +- hadoop-hdds/tools/pom.xml | 9 + .../hdds/scm/cli/ContainerBalancerCommands.java | 19 +- .../scm/cli/ContainerBalancerStartSubcommand.java | 50 +- .../scm/cli/ContainerBalancerStatusSubcommand.java | 2 +- .../hdds/scm/cli/ContainerOperationClient.java | 34 +- .../cli/ReplicationManagerStatusSubcommand.java | 2 +- .../hdds/scm/cli/SafeModeCheckSubcommand.java | 2 +- .../hdds/scm/cli/SafeModeExitSubcommand.java | 2 +- .../hdds/scm/cli/container/ContainerCommands.java | 3 +- .../hdds/scm/cli/container/InfoSubcommand.java | 61 +- .../hdds/scm/cli/container/ReportSubcommand.java | 116 +++ .../scm/cli/datanode/DecommissionSubCommand.java | 2 +- .../scm/cli/datanode/MaintenanceSubCommand.java | 4 +- .../scm/cli/datanode/RecommissionSubCommand.java | 2 +- .../hdds/scm/cli/container/TestInfoSubCommand.java | 249 ++++++ .../scm/cli/container/TestReportSubCommand.java | 159 ++++ .../datanode/TestContainerBalancerSubCommand.java | 8 +- .../scm/cli/datanode/TestListInfoSubcommand.java | 6 +- hadoop-ozone/client/pom.xml | 4 + .../apache/hadoop/ozone/client/ObjectStore.java | 6 +- .../apache/hadoop/ozone/client/OzoneBucket.java | 21 +- .../hadoop/ozone/client/OzoneClientFactory.java | 2 +- .../org/apache/hadoop/ozone/client/OzoneKey.java | 2 +- .../apache/hadoop/ozone/client/OzoneVolume.java | 2 +- .../checksum/AbstractBlockChecksumComputer.java} | 52 +- .../client/checksum/BaseFileChecksumHelper.java | 200 +++++ .../checksum/ReplicatedBlockChecksumComputer.java | 72 ++ .../checksum/ReplicatedFileChecksumHelper.java | 187 +++++ .../hadoop/ozone/client/checksum/package-info.java | 23 + .../ozone/client/io/BlockOutputStreamEntry.java | 6 +- .../hadoop/ozone/client/io/KeyInputStream.java | 8 +- .../ozone/client/protocol/ClientProtocol.java | 27 + .../hadoop/ozone/client/rpc/OzoneKMSUtil.java | 4 +- .../apache/hadoop/ozone/client/rpc/RpcClient.java | 116 ++- .../hadoop/ozone/client/TestHddsClientUtils.java | 4 +- .../TestReplicatedBlockChecksumComputer.java | 68 ++ .../checksum/TestReplicatedFileChecksumHelper.java | 323 ++++++++ .../hadoop/ozone/client/checksum/package-info.java | 23 + .../client/src/test/resources/log4j.properties | 23 - .../main/java/org/apache/hadoop/ozone/OmUtils.java | 4 +- .../java/org/apache/hadoop/ozone/OzoneAcl.java | 8 +- .../org/apache/hadoop/ozone/om/OMConfigKeys.java | 11 +- .../hadoop/ozone/om/helpers/OMNodeDetails.java | 6 +- .../hadoop/ozone/om/helpers/OmBucketArgs.java | 46 +- .../hadoop/ozone/om/helpers/OmBucketInfo.java | 11 +- .../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 +- .../ozone/om/protocol/OzoneManagerProtocol.java | 12 + .../ozone/om/protocolPB/OmTransportFactory.java | 30 +- ...OzoneManagerProtocolClientSideTranslatorPB.java | 30 +- .../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/bats.sh | 8 +- hadoop-ozone/dev-support/checks/checkstyle.sh | 3 + hadoop-ozone/dev-support/checks/coverage.sh | 1 - hadoop-ozone/dist/pom.xml | 2 +- .../dist/src/main/compose/ozone-csi/docker-config | 1 + .../dist/src/main/compose/ozone-ha/docker-config | 4 + .../dist/src/main/compose/ozone/docker-config | 1 + hadoop-ozone/dist/src/main/compose/ozone/test.sh | 6 - .../compose/ozonesecure-ha/keytabs/HTTP.keytab | Bin 144 -> 0 bytes .../main/compose/ozonesecure-ha/keytabs/dn.keytab | Bin 278 -> 0 bytes .../main/compose/ozonesecure-ha/keytabs/om.keytab | Bin 278 -> 0 bytes .../compose/ozonesecure-ha/keytabs/recon.keytab | Bin 296 -> 0 bytes .../main/compose/ozonesecure-ha/keytabs/s3g.keytab | Bin 434 -> 0 bytes .../main/compose/ozonesecure-ha/keytabs/scm.keytab | Bin 586 -> 0 bytes .../compose/ozonesecure-ha/keytabs/testuser.keytab | Bin 152 -> 0 bytes .../ozonesecure-ha/keytabs/testuser2.keytab | Bin 154 -> 0 bytes .../src/main/compose/ozonesecure-mr/docker-config | 1 + .../compose/ozonesecure-mr/keytabs/HTTP.keytab | Bin 144 -> 0 bytes .../main/compose/ozonesecure-mr/keytabs/dn.keytab | Bin 278 -> 0 bytes .../main/compose/ozonesecure-mr/keytabs/om.keytab | Bin 278 -> 0 bytes .../compose/ozonesecure-mr/keytabs/recon.keytab | Bin 296 -> 0 bytes .../main/compose/ozonesecure-mr/keytabs/s3g.keytab | Bin 434 -> 0 bytes .../main/compose/ozonesecure-mr/keytabs/scm.keytab | Bin 586 -> 0 bytes .../compose/ozonesecure-mr/keytabs/testuser.keytab | Bin 152 -> 0 bytes .../ozonesecure-mr/keytabs/testuser2.keytab | Bin 154 -> 0 bytes .../dist/src/main/compose/ozonesecure-mr/test.sh | 4 +- .../src/main/compose/ozonesecure/docker-config | 2 + .../main/compose/ozonesecure/keytabs/HTTP.keytab | Bin 144 -> 0 bytes .../src/main/compose/ozonesecure/keytabs/dn.keytab | Bin 278 -> 0 bytes .../src/main/compose/ozonesecure/keytabs/om.keytab | Bin 278 -> 0 bytes .../main/compose/ozonesecure/keytabs/recon.keytab | Bin 296 -> 0 bytes .../main/compose/ozonesecure/keytabs/s3g.keytab | Bin 434 -> 0 bytes .../main/compose/ozonesecure/keytabs/scm.keytab | Bin 586 -> 0 bytes .../compose/ozonesecure/keytabs/testuser.keytab | Bin 152 -> 0 bytes .../compose/ozonesecure/keytabs/testuser2.keytab | Bin 154 -> 0 bytes .../main/compose/upgrade/compose/ha/docker-config | 4 +- .../compose/upgrade/compose/non-ha/docker-config | 2 +- hadoop-ozone/dist/src/main/docker/Dockerfile | 1 - .../dist/src/main/dockerlibexec/entrypoint.sh | 2 +- hadoop-ozone/dist/src/main/k8s/examples/testlib.sh | 5 +- .../src/main/smoketest/compatibility/read.robot | 9 +- .../compatibility/{write.robot => setup.robot} | 16 +- .../src/main/smoketest/compatibility/write.robot | 7 +- hadoop-ozone/dist/src/shell/ozone/ozone | 17 - .../apache/hadoop/ozone/MiniOzoneChaosCluster.java | 49 +- .../hadoop/ozone/MiniOzoneLoadGenerator.java | 2 +- .../hadoop/ozone/loadgenerators/LoadBucket.java | 2 +- hadoop-ozone/insight/pom.xml | 1 - hadoop-ozone/integration-test/pom.xml | 10 - .../fs/ozone/TestOzoneFSWithObjectStoreCreate.java | 14 +- .../hadoop/fs/ozone/TestOzoneFileInterfaces.java | 2 +- .../hadoop/fs/ozone/TestOzoneFileSystem.java | 44 +- .../apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java | 8 +- .../hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 34 +- .../contract/ITestOzoneContractDistCpWithFSO.java | 65 ++ .../fs/ozone/contract/ITestOzoneContractUtils.java | 4 +- .../hadoop/fs/ozone/contract/OzoneContract.java | 22 +- .../metrics/TestSCMContainerManagerMetrics.java | 2 + .../hdds/scm/pipeline/TestLeaderChoosePolicy.java | 2 +- .../hdds/scm/pipeline/TestMultiRaftSetup.java | 3 +- .../hdds/scm/pipeline/TestPipelineClose.java | 4 +- .../TestRatisPipelineCreateAndDestroy.java | 2 +- .../safemode/TestSCMSafeModeWithPipelineRules.java | 6 +- .../hadoop/hdds/upgrade/TestHDDSUpgrade.java | 8 +- .../org/apache/hadoop/ozone/MiniOzoneCluster.java | 2 +- .../apache/hadoop/ozone/MiniOzoneClusterImpl.java | 24 +- .../hadoop/ozone/MiniOzoneClusterProvider.java | 4 +- .../hadoop/ozone/MiniOzoneHAClusterImpl.java | 378 ++++++--- .../hadoop/ozone/MiniOzoneOMHAClusterImpl.java | 116 --- .../org/apache/hadoop/ozone/OzoneTestUtils.java | 25 +- .../ozone/TestContainerBalancerOperations.java | 23 +- .../hadoop/ozone/TestContainerOperations.java | 2 +- .../java/org/apache/hadoop/ozone/TestDataUtil.java | 2 +- .../apache/hadoop/ozone/TestMiniOzoneCluster.java | 6 +- .../hadoop/ozone/TestMiniOzoneOMHACluster.java | 6 +- .../hadoop/ozone/TestOzoneConfigurationFields.java | 3 +- .../hadoop/ozone/TestSecureOzoneCluster.java | 37 +- .../hadoop/ozone/TestStorageContainerManager.java | 11 +- .../ozone/client/CertificateClientTestImpl.java | 4 +- .../apache/hadoop/ozone/client/rpc/TestBCSID.java | 7 +- .../hadoop/ozone/client/rpc/TestCommitWatcher.java | 2 +- .../client/rpc/TestContainerStateMachine.java | 5 +- .../rpc/TestContainerStateMachineFailures.java | 161 +++- .../rpc/TestContainerStateMachineFlushDelay.java | 4 +- .../client/rpc/TestDeleteWithSlowFollower.java | 11 +- .../client/rpc/TestDiscardPreallocatedBlocks.java | 2 +- .../client/rpc/TestFailureHandlingByClient.java | 2 +- .../client/rpc/TestOzoneAtRestEncryption.java | 22 +- .../rpc/TestOzoneClientMultipartUploadWithFSO.java | 56 +- .../rpc/TestOzoneClientRetriesOnExceptions.java | 4 +- .../client/rpc/TestOzoneRpcClientAbstract.java | 175 ++-- .../rpc/TestOzoneRpcClientForAclAuditLog.java | 18 +- .../TestOzoneRpcClientWithKeyLatestVersion.java | 2 +- .../hadoop/ozone/client/rpc/TestReadRetries.java | 6 +- .../ozone/client/rpc/TestSecureOzoneRpcClient.java | 12 +- .../ozone/client/rpc/TestWatchForCommit.java | 2 +- .../client/rpc/read/TestChunkInputStream.java | 4 +- .../ozone/client/rpc/read/TestInputStreamBase.java | 17 +- .../ozone/client/rpc/read/TestKeyInputStream.java | 12 +- .../apache/hadoop/ozone/container/TestHelper.java | 7 +- .../commandhandler/TestBlockDeletion.java | 1 + .../TestCloseContainerByPipeline.java | 2 +- .../commandhandler/TestCloseContainerHandler.java | 4 +- .../commandhandler/TestDeleteContainerHandler.java | 5 +- .../container/metrics/TestContainerMetrics.java | 5 +- .../container/ozoneimpl/TestOzoneContainer.java | 2 +- .../container/server/TestContainerServer.java | 3 +- .../server/TestSecureContainerServer.java | 7 +- .../ozone/dn/ratis/TestDnRatisLogParser.java | 2 + .../hadoop/ozone/dn/scrubber/TestDataScrubber.java | 7 +- .../TestDatanodeHddsVolumeFailureDetection.java | 9 +- .../freon/TestHadoopDirTreeGeneratorWithFSO.java | 4 +- .../ozone/freon/TestHadoopNestedDirGenerator.java | 26 +- .../ozone/om/TestContainerReportWithKeys.java | 2 +- .../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 387 ++++----- .../org/apache/hadoop/ozone/om/TestKeyPurging.java | 2 +- .../hadoop/ozone/om/TestOMRatisSnapshots.java | 6 +- .../hadoop/ozone/om/TestOMUpgradeFinalization.java | 6 +- .../hadoop/ozone/om/TestObjectStoreWithFSO.java | 8 +- .../org/apache/hadoop/ozone/om/TestOmLDBCli.java | 18 +- .../org/apache/hadoop/ozone/om/TestOmMetrics.java | 2 +- .../ozone/om/TestOmStartupSlvLessThanMlv.java | 6 +- .../ozone/om/TestOzoneManagerConfiguration.java | 4 +- .../apache/hadoop/ozone/om/TestOzoneManagerHA.java | 12 +- .../ozone/om/TestOzoneManagerHAMetadataOnly.java | 2 +- .../hadoop/ozone/om/TestOzoneManagerHAWithACL.java | 8 +- .../ozone/om/TestOzoneManagerHAWithData.java | 4 +- .../ozone/om/TestOzoneManagerHAWithFailover.java | 2 +- .../hadoop/ozone/om/TestOzoneManagerPrepare.java | 2 +- .../ozone/om/TestOzoneManagerRestInterface.java | 2 +- .../hadoop/ozone/om/TestRecursiveAclWithFSO.java | 4 +- .../om/ratis/TestOzoneManagerRatisRequest.java | 4 +- .../snapshot/TestOzoneManagerSnapshotProvider.java | 8 +- .../hadoop/ozone/recon/TestReconScmHASnapshot.java | 70 ++ .../hadoop/ozone/recon/TestReconScmSnapshot.java | 133 +++ .../ozone/recon/TestReconWithOzoneManager.java | 10 +- .../ozone/recon/TestReconWithOzoneManagerFSO.java | 14 +- .../ozone/recon/TestReconWithOzoneManagerHA.java | 12 +- .../hadoop/ozone/scm/TestAllocateContainer.java | 2 +- .../hadoop/ozone/scm/TestCloseContainer.java | 4 +- .../hadoop/ozone/scm/TestFailoverWithSCMHA.java | 2 +- .../ozone/scm/TestSCMInstallSnapshotWithHA.java | 18 +- .../org/apache/hadoop/ozone/scm/TestSCMMXBean.java | 6 +- .../ozone/scm/TestStorageContainerManagerHA.java | 4 +- .../hadoop/ozone/scm/TestXceiverClientGrpc.java | 10 +- .../scm/node/TestDecommissionAndMaintenance.java | 24 +- .../hadoop/ozone/scm/node/TestQueryNode.java | 2 +- .../hadoop/ozone/shell/TestNSSummaryAdmin.java | 4 +- .../hadoop/ozone/shell/TestOzoneShellHA.java | 16 +- .../src/main/proto/OmClientProtocol.proto | 4 +- .../hadoop/ozone/om/codec/TestOmKeyInfoCodec.java | 4 +- .../ozone/om/codec/TestRepeatedOmKeyInfoCodec.java | 4 +- .../ozone/om/helpers/TestInstanceHelper.java | 68 -- .../hadoop/ozone/om/helpers/TestOmPrefixInfo.java | 39 +- .../apache/hadoop/ozone/om/BucketManagerImpl.java | 2 +- .../org/apache/hadoop/ozone/om/KeyManager.java | 111 --- .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 922 +-------------------- .../java/org/apache/hadoop/ozone/om/OMMetrics.java | 8 +- .../hadoop/ozone/om/OmMetadataManagerImpl.java | 22 +- .../org/apache/hadoop/ozone/om/OzoneAclUtils.java | 2 +- .../org/apache/hadoop/ozone/om/OzoneManager.java | 18 +- .../hadoop/ozone/om/OzoneManagerHttpServer.java | 4 +- .../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 +- .../apache/hadoop/ozone/om/fs/OzoneManagerFS.java | 6 - .../ozone/om/ratis/OzoneManagerDoubleBuffer.java | 4 +- .../ozone/om/ratis/OzoneManagerStateMachine.java | 6 +- .../om/ratis/utils/OzoneManagerRatisUtils.java | 9 +- .../hadoop/ozone/om/request/OMClientRequest.java | 6 +- .../om/request/bucket/OMBucketCreateRequest.java | 6 +- ...tyRequest.java => OMBucketSetOwnerRequest.java} | 223 ++--- .../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 +- .../key/OMOpenKeysDeleteRequest.java | 4 +- .../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 +- .../response/bucket/OMBucketSetOwnerResponse.java | 80 ++ .../OzoneDelegationTokenSecretManager.java | 2 +- .../hadoop/ozone/security/OzoneSecretStore.java | 4 +- .../org/apache/hadoop/ozone/om/OmTestManagers.java | 122 +++ .../hadoop/ozone/om/TestBucketManagerImpl.java | 6 +- .../hadoop/ozone/om/TestKeyDeletingService.java | 106 ++- .../apache/hadoop/ozone/om/TestKeyManagerUnit.java | 72 +- .../apache/hadoop/ozone/om/TestOMDBDefinition.java | 2 +- .../hadoop/ozone/om/TestOmMetadataManager.java | 50 +- .../apache/hadoop/ozone/om/TestTrashService.java | 40 +- .../hadoop/ozone/om/failover/TestOMFailovers.java | 2 +- ...tOzoneManagerDoubleBufferWithDummyResponse.java | 2 +- ...TestOzoneManagerDoubleBufferWithOMResponse.java | 12 +- .../om/ratis/TestOzoneManagerRatisServer.java | 2 +- .../om/ratis/TestOzoneManagerStateMachine.java | 2 +- ...OMRequestUtils.java => OMRequestTestUtils.java} | 10 +- .../request/TestOMClientRequestWithUserInfo.java | 2 +- .../request/bucket/TestOMBucketCreateRequest.java | 8 +- .../bucket/TestOMBucketCreateRequestWithFSO.java | 4 +- .../request/bucket/TestOMBucketDeleteRequest.java | 6 +- .../bucket/TestOMBucketSetPropertyRequest.java | 8 +- .../bucket/acl/TestOMBucketAddAclRequest.java | 12 +- .../bucket/acl/TestOMBucketRemoveAclRequest.java | 14 +- .../bucket/acl/TestOMBucketSetAclRequest.java | 12 +- .../request/file/TestOMDirectoryCreateRequest.java | 24 +- .../file/TestOMDirectoryCreateRequestWithFSO.java | 48 +- .../om/request/file/TestOMFileCreateRequest.java | 36 +- .../file/TestOMFileCreateRequestWithFSO.java | 22 +- .../om/request/key/TestOMAllocateBlockRequest.java | 12 +- .../key/TestOMAllocateBlockRequestWithFSO.java | 10 +- .../ozone/om/request/key/TestOMKeyAclRequest.java | 10 +- .../om/request/key/TestOMKeyAclRequestWithFSO.java | 8 +- .../om/request/key/TestOMKeyCommitRequest.java | 16 +- .../request/key/TestOMKeyCommitRequestWithFSO.java | 10 +- .../om/request/key/TestOMKeyCreateRequest.java | 10 +- .../request/key/TestOMKeyCreateRequestWithFSO.java | 6 +- .../om/request/key/TestOMKeyDeleteRequest.java | 10 +- .../request/key/TestOMKeyDeleteRequestWithFSO.java | 14 +- .../key/TestOMKeyPurgeRequestAndResponse.java | 10 +- .../om/request/key/TestOMKeyRenameRequest.java | 15 +- .../om/request/key/TestOMKeysDeleteRequest.java | 6 +- .../om/request/key/TestOMKeysRenameRequest.java | 6 +- .../request/key/TestOMOpenKeysDeleteRequest.java | 13 +- .../om/request/key/TestOMPrefixAclRequest.java | 6 +- .../TestS3InitiateMultipartUploadRequest.java | 6 +- ...estS3InitiateMultipartUploadRequestWithFSO.java | 4 +- .../s3/multipart/TestS3MultipartRequest.java | 12 +- .../TestS3MultipartUploadAbortRequest.java | 8 +- .../TestS3MultipartUploadAbortRequestWithFSO.java | 4 +- .../TestS3MultipartUploadCommitPartRequest.java | 12 +- ...tS3MultipartUploadCommitPartRequestWithFSO.java | 10 +- .../TestS3MultipartUploadCompleteRequest.java | 14 +- ...estS3MultipartUploadCompleteRequestWithFSO.java | 8 +- .../upgrade/TestOMCancelPrepareRequest.java | 2 +- .../request/volume/TestOMVolumeCreateRequest.java | 6 +- .../request/volume/TestOMVolumeDeleteRequest.java | 12 +- .../volume/TestOMVolumeSetOwnerRequest.java | 27 +- .../volume/TestOMVolumeSetQuotaRequest.java | 29 +- .../volume/acl/TestOMVolumeAddAclRequest.java | 12 +- .../volume/acl/TestOMVolumeRemoveAclRequest.java | 14 +- .../volume/acl/TestOMVolumeSetAclRequest.java | 12 +- .../ozone/om/response/TestCleanupTableInfo.java | 4 +- .../file/TestOMDirectoryCreateResponse.java | 4 +- .../file/TestOMDirectoryCreateResponseWithFSO.java | 4 +- .../file/TestOMFileCreateResponseWithFSO.java | 4 +- .../response/key/TestOMAllocateBlockResponse.java | 4 +- .../key/TestOMAllocateBlockResponseWithFSO.java | 4 +- .../om/response/key/TestOMKeyCommitResponse.java | 6 +- .../key/TestOMKeyCommitResponseWithFSO.java | 8 +- .../key/TestOMKeyCreateResponseWithFSO.java | 4 +- .../om/response/key/TestOMKeyDeleteResponse.java | 4 +- .../key/TestOMKeyDeleteResponseWithFSO.java | 12 +- .../om/response/key/TestOMKeyRenameResponse.java | 14 +- .../ozone/om/response/key/TestOMKeyResponse.java | 4 +- .../om/response/key/TestOMKeysDeleteResponse.java | 4 +- .../om/response/key/TestOMKeysRenameResponse.java | 8 +- .../response/key/TestOMOpenKeysDeleteResponse.java | 8 +- ...S3MultipartUploadCommitPartResponseWithFSO.java | 10 +- ...stS3MultipartUploadCompleteResponseWithFSO.java | 18 +- .../ozone/om/upgrade/TestOMUpgradeFinalizer.java | 2 +- .../om/upgrade/TestOzoneManagerPrepareState.java | 2 +- .../TestOzoneDelegationTokenSecretManager.java | 6 +- .../ozone/security/TestOzoneTokenIdentifier.java | 6 +- .../security/acl/TestOzoneNativeAuthorizer.java | 89 +- .../hadoop/ozone/security/acl/TestParentAcl.java | 50 +- .../hadoop/ozone/security/acl/TestVolumeOwner.java | 51 +- .../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 +- .../apache/hadoop/ozone/recon/ReconConstants.java | 2 + .../hadoop/ozone/recon/ReconServerConfigKeys.java | 23 + .../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 | 6 +- .../ozone/recon/scm/ReconContainerManager.java | 4 +- .../hadoop/ozone/recon/scm/ReconNodeManager.java | 11 + .../ozone/recon/scm/ReconPipelineFactory.java | 2 +- .../scm/ReconStorageContainerManagerFacade.java | 129 ++- .../recon/spi/StorageContainerServiceProvider.java | 12 + .../recon/spi/impl/ContainerKeyPrefixCodec.java | 2 +- .../spi/impl/OzoneManagerServiceProviderImpl.java | 61 +- .../impl/StorageContainerServiceProviderImpl.java | 139 +++- .../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 | 88 +- .../TestStorageContainerServiceProviderImpl.java | 12 + .../recon/tasks/TestContainerKeyMapperTask.java | 2 +- .../ozone/recon/tasks/TestOMDBUpdatesHandler.java | 4 +- .../ozone/recon/tasks/TestTableCountTask.java | 2 +- .../apache/hadoop/ozone/s3/OzoneClientCache.java | 10 +- .../hadoop/ozone/s3/OzoneClientProducer.java | 23 +- .../hadoop/ozone/s3/OzoneServiceProvider.java | 78 -- .../hadoop/ozone/s3/VirtualHostStyleFilter.java | 8 +- .../hadoop/ozone/s3/endpoint/BucketEndpoint.java | 19 +- .../hadoop/ozone/s3/endpoint/EndpointBase.java | 2 +- .../hadoop/ozone/s3/endpoint/ObjectEndpoint.java | 43 +- .../org/apache/hadoop/ozone/s3/endpoint/S3Acl.java | 6 +- .../hadoop/ozone/s3/endpoint/S3BucketAcl.java | 4 +- .../hadoop/ozone/s3/exception/S3ErrorTable.java | 12 +- .../hadoop/ozone/s3/signature/Credential.java | 2 +- .../hadoop/ozone/client/OzoneBucketStub.java | 2 +- .../ozone/protocolPB/TestGrpcOmTransport.java | 5 + .../hadoop/ozone/s3/TestOzoneClientProducer.java | 131 ++- .../ozone/s3/TestVirtualHostStyleFilter.java | 2 +- .../s3/commontypes/TestObjectKeyNameAdapter.java | 2 +- .../hadoop/ozone/s3/endpoint/TestObjectHead.java | 2 +- .../hadoop/ozone/s3/endpoint/TestRootList.java | 2 +- .../tools/dev-support/findbugsExcludeFile.xml | 4 - hadoop-ozone/tools/pom.xml | 15 - .../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 | 12 +- .../org/apache/hadoop/ozone/debug/DBScanner.java | 8 +- .../apache/hadoop/ozone/debug/PrefixParser.java | 2 +- .../apache/hadoop/ozone/debug/ReadReplicas.java | 247 ++++++ .../hadoop/ozone/freon/BaseFreonGenerator.java | 2 +- .../hadoop/ozone/freon/ChunkManagerDiskWrite.java | 8 +- .../hadoop/ozone/freon/DatanodeChunkGenerator.java | 12 +- .../hadoop/ozone/freon/HadoopDirTreeGenerator.java | 2 +- .../containergenerator/GeneratorDatanode.java | 6 +- .../GenerateOzoneRequiredConfigurations.java | 2 +- .../hadoop/ozone/genesis/BenchMarkCRCBatch.java | 141 ---- .../ozone/genesis/BenchMarkCRCStreaming.java | 173 ---- .../ozone/genesis/BenchMarkContainerStateMap.java | 199 ----- .../ozone/genesis/BenchMarkDatanodeDispatcher.java | 339 -------- .../ozone/genesis/BenchMarkOzoneManager.java | 193 ----- .../apache/hadoop/ozone/genesis/BenchMarkSCM.java | 126 --- .../ozone/genesis/BenchmarkBlockDataToString.java | 166 ---- .../ozone/genesis/BenchmarkChunkManager.java | 180 ---- .../org/apache/hadoop/ozone/genesis/Genesis.java | 108 --- .../ozone/genesis/GenesisMemoryProfiler.java | 61 -- .../apache/hadoop/ozone/genesis/GenesisUtil.java | 162 ---- .../apache/hadoop/ozone/genesis/package-info.java | 25 - .../apache/hadoop/ozone/shell/OzoneAddress.java | 4 +- .../hadoop/ozone/shell/bucket/BucketCommands.java | 3 +- .../ozone/shell/bucket/CreateBucketHandler.java | 2 +- .../ozone/shell/bucket/UpdateBucketHandler.java | 62 ++ .../hadoop/ozone/audit/parser/TestAuditParser.java | 2 +- .../hadoop/ozone/conf/TestGetConfOptions.java | 4 +- .../TestGenerateOzoneRequiredConfigurations.java | 4 +- .../org/apache/hadoop/test/OzoneTestDriver.java | 6 +- pom.xml | 13 - 744 files changed, 9071 insertions(+), 7635 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
