This is an automated email from the ASF dual-hosted git repository. captainzmc pushed a commit to branch HDDS-4454 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 6b43b5c43e3d82657bd3a5a16399b9707331aa72 Merge: 67c3771 2020d30 Author: captainzmc <[email protected]> AuthorDate: Tue Aug 10 14:03:57 2021 +0800 Merge remote-tracking branch 'origin/master' into HDDS-4454 .github/workflows/post-commit.yml | 54 +-- .../org/apache/hadoop/hdds/HddsConfigKeys.java | 2 +- .../hadoop/hdds/client/ReplicationConfig.java | 10 +- .../hdds/client/ReplicationConfigValidator.java | 63 +++ .../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 5 + .../org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java | 2 + .../ozone/upgrade/BasicUpgradeFinalizer.java | 18 +- .../common/src/main/resources/ozone-default.xml | 27 +- .../hadoop/hdds/client/TestReplicationConfig.java | 24 ++ .../client/TestReplicationConfigValidator.java | 73 ++++ .../common/statemachine/DatanodeStateMachine.java | 8 +- .../OnDemandContainerReplicationSource.java | 10 +- .../container/stream/DirectoryServerSource.java | 12 +- .../upgrade/DataNodeUpgradeFinalizer.java | 4 +- .../apache/hadoop/hdds/utils/db/TestRDBStore.java | 2 +- .../hadoop/hdds/scm/SCMCommonPlacementPolicy.java | 14 + .../java/org/apache/hadoop/hdds/scm/ScmUtils.java | 10 + .../hadoop/hdds/scm/block/BlockManagerImpl.java | 19 +- .../hadoop/hdds/scm/block/DeletedBlockLogImpl.java | 281 ++++++-------- .../hdds/scm/block/DeletedBlockLogImplV2.java | 432 --------------------- .../hdds/scm/block/SCMBlockDeletingService.java | 11 +- .../scm/block/ScmBlockDeletingServiceMetrics.java | 186 +++++++++ .../scm/command/CommandStatusReportHandler.java | 6 +- .../hdds/scm/container/ContainerStateManager.java | 10 +- .../hdds/scm/container/ReplicationManager.java | 117 +++--- .../replication/ReplicationManagerMetrics.java | 161 ++++++++ .../scm/container/states/ContainerQueryKey.java | 33 +- .../scm/container/states/ContainerStateMap.java | 41 +- .../hdds/scm/ha/SCMHADBTransactionBufferImpl.java | 6 +- .../apache/hadoop/hdds/scm/ha/SCMStateMachine.java | 6 +- .../apache/hadoop/hdds/scm/node/NodeManager.java | 9 + .../hadoop/hdds/scm/node/SCMNodeManager.java | 27 ++ .../hdds/scm/pipeline/PipelinePlacementPolicy.java | 6 + .../hdds/scm/pipeline/PipelineReportHandler.java | 2 + .../hdds/scm/server/StorageContainerManager.java | 7 +- .../scm/server/upgrade/SCMUpgradeFinalizer.java | 3 +- .../ScmHAUnfinalizedStateValidationAction.java | 13 +- .../hadoop/hdds/scm/block/TestDeletedBlockLog.java | 19 +- .../hdds/scm/container/TestReplicationManager.java | 245 ++++++++++-- .../hdds/scm/cli/container/ContainerCommands.java | 1 - .../hdds/scm/cli/container/DeleteSubcommand.java | 54 --- .../org/apache/hadoop/ozone/client/BucketArgs.java | 25 +- .../apache/hadoop/ozone/client/OzoneBucket.java | 45 ++- .../apache/hadoop/ozone/client/rpc/RpcClient.java | 33 +- .../hadoop/ozone/om/helpers/BucketLayout.java | 62 +++ .../hadoop/ozone/om/helpers/OmBucketInfo.java | 56 ++- .../apache/hadoop/ozone/om/helpers/OmKeyInfo.java | 1 - .../ozone/om/helpers/OmKeyLocationInfoGroup.java | 5 +- .../hadoop/ozone/om/helpers/OzoneFSUtils.java | 25 +- .../om/helpers/TestOmKeyLocationInfoGroup.java | 19 + .../dist/src/main/compose/ozone-ha/docker-config | 1 + .../src/main/compose/ozone-om-ha/docker-config | 1 + .../dist/src/main/compose/ozone/docker-config | 1 + .../src/main/compose/ozonesecure-ha/docker-config | 4 + .../src/main/compose/ozonesecure/docker-config | 4 + hadoop-ozone/dist/src/main/license/jar-report.txt | 46 +-- .../dist/src/main/license/update-jar-report.sh | 2 +- .../src/main/smoketest/admincli/container.robot | 4 - .../hadoop/fs/ozone/TestOzoneFileSystem.java | 12 +- .../fs/ozone/TestOzoneFileSystemWithFSO.java | 3 +- .../hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 55 ++- .../fs/ozone/TestRootedOzoneFileSystemWithFSO.java | 30 +- .../ozone/contract/ITestOzoneContractDistCp.java | 8 + .../rooted/ITestRootedOzoneContractDistCp.java | 8 + .../TestContainerStateManagerIntegration.java | 40 +- .../hdds/scm/pipeline/TestMultiRaftSetup.java | 173 +++++++++ .../java/org/apache/hadoop/ozone/TestDataUtil.java | 40 +- .../client/rpc/TestOzoneAtRestEncryption.java | 130 +++++-- .../commandhandler/TestBlockDeletion.java | 17 + .../server/TestSecureContainerServer.java | 6 + .../hadoop/ozone/om/TestOMRatisSnapshots.java | 13 +- .../hadoop/ozone/om/TestOMStartupWithLayout.java | 197 ---------- .../hadoop/ozone/om/TestObjectStoreWithFSO.java | 76 +++- .../hadoop/ozone/om/TestOmBlockVersioning.java | 21 +- .../hadoop/ozone/scm/TestCloseContainer.java | 8 + .../ozone/scm/TestSCMInstallSnapshotWithHA.java | 7 + .../hadoop/ozone/shell/TestOzoneShellHA.java | 9 +- .../src/main/proto/OmClientProtocol.proto | 7 + .../hadoop/ozone/om/TrashOzoneFileSystem.java | 4 +- .../om/request/bucket/OMBucketCreateRequest.java | 102 ++--- .../hadoop/ozone/om/request/key/OMKeyRequest.java | 24 +- .../ozone/om/upgrade/OMUpgradeFinalizer.java | 3 +- .../fs/ozone/BasicOzoneClientAdapterImpl.java | 4 +- .../ozone/BasicRootedOzoneClientAdapterImpl.java | 40 +- .../fs/ozone/BasicRootedOzoneFileSystem.java | 4 +- .../recon/scm/ReconPipelineReportHandler.java | 22 +- .../java/org/apache/hadoop/ozone/s3/Gateway.java | 29 ++ .../hadoop/ozone/s3/S3GatewayConfigKeys.java | 7 + .../ozone/genesis/BenchMarkContainerStateMap.java | 6 +- .../ozone/shell/bucket/CreateBucketHandler.java | 20 +- .../hadoop/ozone/shell/keys/CopyKeyHandler.java | 4 +- .../hadoop/ozone/shell/keys/PutKeyHandler.java | 4 +- pom.xml | 2 +- 93 files changed, 2111 insertions(+), 1391 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
