This is an automated email from the ASF dual-hosted git repository. avijayan pushed a commit to branch HDDS-3698-upgrade in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 28ecd8ddc4b009de1bde0697505402a47f1ede76 Merge: 18bef92 239d05c Author: Aravindan Vijayan <[email protected]> AuthorDate: Mon Nov 9 09:52:14 2020 -0800 Merge remote-tracking branch 'upstream/master' into HDDS-3698-upgrade README.md | 20 ++-- .../hadoop/hdds/protocol/DatanodeDetails.java | 5 +- .../java/org/apache/hadoop/hdds/scm/ScmConfig.java | 20 ++++ .../org/apache/hadoop/hdds/conf/ConfigTag.java | 3 +- .../ClosePipelineCommandHandler.java | 15 +-- .../CreatePipelineCommandHandler.java | 28 ++--- .../transport/server/ratis/XceiverServerRatis.java | 9 +- .../replication/DownloadAndImportReplicator.java | 12 +- .../protocol/commands/CreatePipelineCommand.java | 16 +++ .../replication/TestReplicationSupervisor.java | 35 ++++++ hadoop-hdds/docs/content/feature/Quota.md | 74 ++++++++++++ hadoop-hdds/docs/content/feature/Quota.zh.md | 67 +++++++++++ hadoop-hdds/docs/content/tools/Admin.md | 4 +- .../hdds/conf/DatanodeRatisServerConfig.java | 17 +++ .../block/DatanodeDeletedBlockTransactions.java | 122 ++++++------------- .../hadoop/hdds/scm/block/DeletedBlockLog.java | 4 +- .../hadoop/hdds/scm/block/DeletedBlockLogImpl.java | 54 ++++++--- .../hdds/scm/block/SCMBlockDeletingService.java | 130 ++++++++++----------- .../hadoop/hdds/scm/block/TestDeletedBlockLog.java | 97 ++++++--------- hadoop-ozone/common/pom.xml | 5 + .../main/java/org/apache/hadoop/ozone/OmUtils.java | 39 +++++++ .../ozone/om/ha/OMFailoverProxyProvider.java | 2 +- .../hadoop/ozone/om/lock/TestOzoneManagerLock.java | 52 ++++----- .../docker-image/docker-krb5/Dockerfile-krb5 | 2 +- .../compose/ozone-mr/hadoop27/docker-compose.yaml | 2 +- .../compose/ozone-mr/hadoop31/docker-compose.yaml | 2 +- .../compose/ozone-mr/hadoop32/docker-compose.yaml | 2 +- .../compose/ozonesecure-mr/docker-compose.yaml | 4 +- .../main/smoketest/security/ozone-secure-fs.robot | 2 +- .../fs/ozone/TestOzoneFSWithObjectStoreCreate.java | 71 ++++++++++- .../commandhandler/TestBlockDeletion.java | 7 +- .../container/metrics/TestContainerMetrics.java | 43 +++---- .../apache/hadoop/ozone/om/OMMetadataManager.java | 6 +- .../hadoop/ozone/om/codec/UserVolumeInfoCodec.java | 18 +-- .../src/main/proto/OmStorageProtocol.proto | 6 + .../apache/hadoop/ozone/om/BucketManagerImpl.java | 32 ++--- .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 67 ++++++----- .../hadoop/ozone/om/OmMetadataManagerImpl.java | 17 +-- .../org/apache/hadoop/ozone/om/OzoneManager.java | 5 +- .../apache/hadoop/ozone/om/PrefixManagerImpl.java | 24 ++-- .../hadoop/ozone/om/S3SecretManagerImpl.java | 8 +- .../apache/hadoop/ozone/om/VolumeManagerImpl.java | 79 ++++++------- .../hadoop/ozone/om/codec/OMDBDefinition.java | 6 +- .../hadoop/ozone/om/request/OMClientRequest.java | 20 +--- .../ozone/om/request/key/OMKeyCommitRequest.java | 4 +- .../om/request/volume/OMVolumeCreateRequest.java | 5 +- .../om/request/volume/OMVolumeDeleteRequest.java | 4 +- .../ozone/om/request/volume/OMVolumeRequest.java | 24 ++-- .../om/request/volume/OMVolumeSetOwnerRequest.java | 5 +- .../om/response/volume/OMVolumeCreateResponse.java | 7 +- .../om/response/volume/OMVolumeDeleteResponse.java | 10 +- .../response/volume/OMVolumeSetOwnerResponse.java | 13 ++- .../ozone/om/request/TestOMRequestUtils.java | 8 +- .../request/volume/TestOMVolumeCreateRequest.java | 5 +- .../volume/TestOMVolumeSetOwnerRequest.java | 8 +- .../volume/TestOMVolumeCreateResponse.java | 6 +- .../volume/TestOMVolumeDeleteResponse.java | 8 +- .../volume/TestOMVolumeSetOwnerResponse.java | 11 +- .../hadoop/ozone/s3/AWSSignatureProcessor.java | 43 +++++-- .../hadoop/ozone/s3/OzoneClientProducer.java | 61 +++++++--- .../apache/hadoop/ozone/s3/SignatureProcessor.java | 2 + .../hadoop/ozone/s3/exception/S3ErrorTable.java | 5 + .../hadoop/ozone/s3/TestOzoneClientProducer.java | 25 +++- .../hadoop/ozone/s3/endpoint/TestBucketPut.java | 5 + .../hadoop/ozone/s3/endpoint/TestRootList.java | 5 + .../java/org/apache/hadoop/ozone/shell/Shell.java | 24 ++-- 66 files changed, 963 insertions(+), 578 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
