This is an automated email from the ASF dual-hosted git repository. aengineer pushed a commit to branch ozone-0.4.1 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 20b2cd669527b152a2750c86d0ed9c6cc6a31846 Merge: 0b92dec b41ef61 Author: Anu Engineer <[email protected]> AuthorDate: Thu Jul 25 14:08:41 2019 -0700 Merge branch 'trunk' into ozone-0.4.1 .../org/apache/hadoop/fs/shell/AclCommands.java | 6 +- .../main/java/org/apache/hadoop/io/IOUtils.java | 2 - .../src/main/resources/core-default.xml | 4 +- .../src/site/markdown/FileSystemShell.md | 2 +- .../src/site/markdown/filesystem/filesystem.md | 44 ++- .../filesystem/fsdatainputstreambuilder.md | 2 +- .../AbstractContractRootDirectoryTest.java | 2 +- .../hadoop/fs/contract/ContractTestUtils.java | 30 +- .../apache/hadoop/hdds/scm/XceiverClientGrpc.java | 4 + .../java/org/apache/hadoop/ozone/OzoneConsts.java | 1 + .../common/src/main/resources/ozone-default.xml | 8 + .../hadoop/hdds/scm/cli/TopologySubcommand.java | 60 +++- .../server/federation/router/FederationUtil.java | 13 +- .../federation/router/TestFederationUtil.java | 69 ++++ .../hdfs/server/namenode/FSImageFormatPBINode.java | 4 +- .../hdfs/server/namenode/INodeDirectory.java | 16 + .../hadoop/hdfs/server/namenode/NameNode.java | 4 + .../hadoop/hdfs/server/common/TestJspHelper.java | 34 ++ .../test/java/org/apache/hadoop/hdfs/NNBench.java | 2 +- .../main/java/org/apache/hadoop/ozone/OmUtils.java | 1 - .../org/apache/hadoop/ozone/audit/OMAction.java | 2 + .../org/apache/hadoop/ozone/om/OMConfigKeys.java | 3 + .../hadoop/ozone/om/exceptions/OMException.java | 3 +- .../ozone/om/protocol/OzoneManagerHAProtocol.java | 18 +- .../src/main/proto/OzoneManagerProtocol.proto | 9 +- .../dist/src/main/compose/ozone-topology/test.sh | 2 + .../dist/src/main/smoketest/topology/scmcli.robot | 32 ++ .../org/apache/hadoop/ozone/MiniOzoneCluster.java | 7 + .../hadoop/ozone/MiniOzoneHAClusterImpl.java | 54 ++- .../ozoneimpl/TestSecureOzoneContainer.java | 2 + .../server/TestSecureContainerServer.java | 2 + .../hadoop/ozone/om/TestOMRatisSnapshots.java | 189 ++++++++++ .../apache/hadoop/ozone/om/TestOzoneManagerHA.java | 7 +- .../org/apache/hadoop/ozone/om/KeyManager.java | 11 - .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 10 +- .../hadoop/ozone/om/OMDBCheckpointServlet.java | 2 +- .../java/org/apache/hadoop/ozone/om/OMMetrics.java | 22 +- .../org/apache/hadoop/ozone/om/OzoneManager.java | 381 +++++++++++++++------ .../ozone/om/ratis/OzoneManagerDoubleBuffer.java | 3 + .../ozone/om/ratis/OzoneManagerRatisServer.java | 15 +- .../ozone/om/ratis/OzoneManagerStateMachine.java | 130 +++---- .../om/ratis/utils/OzoneManagerRatisUtils.java | 12 + .../request/s3/bucket/S3BucketDeleteRequest.java | 193 +++++++++++ .../S3InitiateMultipartUploadRequest.java | 213 ++++++++++++ .../multipart/S3MultipartUploadAbortRequest.java | 173 ++++++++++ .../S3MultipartUploadCommitPartRequest.java | 217 ++++++++++++ .../om/request/s3/multipart/package-info.java} | 21 +- .../om/request/volume/OMVolumeSetOwnerRequest.java | 4 +- .../om/request/volume/OMVolumeSetQuotaRequest.java | 3 +- .../response/s3/bucket/S3BucketCreateResponse.java | 8 +- ...teResponse.java => S3BucketDeleteResponse.java} | 54 +-- .../S3InitiateMultipartUploadResponse.java | 80 +++++ .../multipart/S3MultipartUploadAbortResponse.java | 83 +++++ .../S3MultipartUploadCommitPartResponse.java | 109 ++++++ .../om/response/s3/multipart/package-info.java} | 22 +- .../om/snapshot/OzoneManagerSnapshotProvider.java | 2 +- .../OzoneManagerHARequestHandlerImpl.java | 18 +- .../protocolPB/OzoneManagerRequestHandler.java | 35 -- .../ozone/om/request/TestOMRequestUtils.java | 85 +++++ .../s3/bucket/TestS3BucketDeleteRequest.java | 167 +++++++++ .../TestS3InitiateMultipartUploadRequest.java | 153 +++++++++ .../s3/multipart/TestS3MultipartRequest.java | 178 ++++++++++ .../TestS3MultipartUploadAbortRequest.java | 158 +++++++++ .../TestS3MultipartUploadCommitPartRequest.java | 209 +++++++++++ .../s3/multipart/package-info.java} | 20 +- .../ozone/om/response/TestOMResponseUtils.java | 42 +++ .../s3/bucket/TestS3BucketCreateResponse.java | 41 +-- .../s3/bucket/TestS3BucketDeleteResponse.java | 73 ++++ .../TestS3InitiateMultipartUploadResponse.java | 63 ++++ .../s3/multipart/TestS3MultipartResponse.java | 143 ++++++++ .../TestS3MultipartUploadAbortResponse.java | 129 +++++++ .../multipart/package-info.java} | 20 +- hadoop-project/pom.xml | 3 +- .../java/org/apache/hadoop/fs/s3a/Constants.java | 4 +- .../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 27 +- .../hadoop/fs/s3a/s3guard/DDBPathMetadata.java | 11 +- .../hadoop/fs/s3a/s3guard/DirListingMetadata.java | 41 ++- .../fs/s3a/s3guard/DynamoDBMetadataStore.java | 23 +- .../hadoop/fs/s3a/s3guard/LocalMetadataStore.java | 50 +-- .../apache/hadoop/fs/s3a/s3guard/PathMetadata.java | 62 +++- .../org/apache/hadoop/fs/s3a/s3guard/S3Guard.java | 13 +- .../src/site/markdown/tools/hadoop-aws/index.md | 4 +- .../site/markdown/tools/hadoop-aws/performance.md | 4 +- .../src/site/markdown/tools/hadoop-aws/testing.md | 6 +- .../tools/hadoop-aws/troubleshooting_s3a.md | 2 +- .../fs/contract/s3a/ITestS3AContractRootDir.java | 9 +- .../hadoop/fs/s3a/ITestS3GuardEmptyDirs.java | 155 ++++++++- .../fs/s3a/ITestS3GuardOutOfBandOperations.java | 46 ++- .../org/apache/hadoop/fs/s3a/ITestS3GuardTtl.java | 70 ++++ .../org/apache/hadoop/fs/s3a/S3ATestUtils.java | 26 ++ .../fs/s3a/s3guard/ITestDynamoDBMetadataStore.java | 2 +- .../fs/s3a/s3guard/ITestS3GuardConcurrentOps.java | 10 + .../s3a/s3guard/ITestS3GuardDDBRootOperations.java | 2 +- .../fs/s3a/s3guard/MetadataStoreTestBase.java | 5 +- .../fs/s3a/s3guard/TestDirListingMetadata.java | 44 ++- .../fs/s3a/s3guard/TestLocalMetadataStore.java | 40 +++ .../apache/hadoop/fs/s3a/s3guard/TestS3Guard.java | 14 +- .../hadoop-aws/src/test/resources/core-site.xml | 4 +- .../constants/FileSystemConfigurations.java | 2 +- .../TestAbfsConfigurationFieldsValidation.java | 6 + .../apache/hadoop/tools/mapred/CopyCommitter.java | 14 +- .../hadoop/tools/mapred/TestCopyCommitter.java | 80 +++++ .../hadoop/fs/swift/http/ExceptionDiags.java | 2 - .../pom.xml | 1 - 104 files changed, 4153 insertions(+), 569 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
