This is an automated email from the ASF dual-hosted git repository. siyao pushed a commit to branch HDDS-4944 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 1acaa82f34a973c84443697b1cd820fb0f756cef Merge: dcd17390be 2222be3303 Author: Siyao Meng <[email protected]> AuthorDate: Fri May 27 05:10:11 2022 -0700 Merge remote-tracking branch 'asf/master' into HDDS-4944 Conflicts: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java .github/workflows/post-commit.yml | 22 +- dev-support/ci/selective_ci_checks.bats | 8 +- dev-support/ci/selective_ci_checks.sh | 6 +- .../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 11 + .../org/apache/hadoop/ozone/ClientVersion.java | 4 + .../main/resources/network-topology-default.yaml | 26 +- .../common/src/main/resources/ozone-default.xml | 18 + .../hadoop/hdds/scm/net/TestYamlSchemaLoader.java | 13 + .../container/keyvalue/TestKeyValueContainer.java | 8 +- .../hadoop/hdds/utils/db/RDBBatchOperation.java | 37 +- .../hadoop/hdds/utils/db/RDBCheckpointManager.java | 33 +- .../org/apache/hadoop/hdds/utils/db/RDBStore.java | 183 ++------ .../org/apache/hadoop/hdds/utils/db/RDBTable.java | 140 ++---- .../apache/hadoop/hdds/utils/db/RocksDatabase.java | 485 +++++++++++++++++++ .../apache/hadoop/hdds/utils/db/StringCodec.java | 2 +- .../apache/hadoop/hdds/utils/db/TableConfig.java | 7 +- .../hadoop/hdds/utils/db/TestRDBTableStore.java | 2 +- .../hadoop/hdds/scm/ha/BackgroundSCMService.java | 208 +++++++++ .../hdds/scm/server/StorageContainerManager.java | 31 ++ .../hdds/scm/ha/TestBackgroundSCMService.java | 113 +++++ .../hadoop/ozone/om/helpers/BucketLayout.java | 17 + .../apache/hadoop/ozone/om/lock/OMLockMetrics.java | 2 + .../hadoop/ozone/om/lock/TestOzoneManagerLock.java | 23 + .../org/apache/hadoop/ozone/om/TestListStatus.java | 196 ++++++++ .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 48 +- .../hadoop/ozone/om/OzoneListStatusHelper.java | 520 +++++++++++++++++++++ .../hadoop/ozone/om/TrashOzoneFileSystem.java | 4 + .../om/request/bucket/OMBucketDeleteRequest.java | 34 ++ .../om/request/file/OMDirectoryCreateRequest.java | 31 ++ .../ozone/om/request/file/OMFileCreateRequest.java | 35 +- .../om/request/key/OMAllocateBlockRequest.java | 29 ++ .../ozone/om/request/key/OMKeyCommitRequest.java | 29 ++ .../ozone/om/request/key/OMKeyCreateRequest.java | 29 ++ .../ozone/om/request/key/OMKeyDeleteRequest.java | 35 ++ .../ozone/om/request/key/OMKeyRenameRequest.java | 35 ++ .../ozone/om/request/key/OMKeysDeleteRequest.java | 35 ++ .../ozone/om/request/key/OMKeysRenameRequest.java | 35 ++ .../om/request/key/OMOpenKeysDeleteRequest.java | 5 +- .../S3InitiateMultipartUploadRequest.java | 30 ++ .../multipart/S3MultipartUploadAbortRequest.java | 29 ++ .../S3MultipartUploadCommitPartRequest.java | 29 ++ .../S3MultipartUploadCompleteRequest.java | 29 ++ .../om/request/validation/RequestValidations.java | 2 +- .../om/response/key/OMOpenKeysDeleteResponse.java | 14 +- .../protocolPB/OzoneManagerRequestHandler.java | 234 ++++++++++ .../request/key/TestOMOpenKeysDeleteRequest.java | 267 ++++++----- .../response/key/TestOMOpenKeysDeleteResponse.java | 50 +- .../spi/impl/OzoneManagerServiceProviderImpl.java | 4 +- .../impl/TestOzoneManagerServiceProviderImpl.java | 11 +- .../ozone/recon/tasks/TestOMDBUpdatesHandler.java | 6 +- 50 files changed, 2744 insertions(+), 460 deletions(-) diff --cc hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java index 94b9b6d56c,0e882a6f41..1ecbf1cf21 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java @@@ -32,6 -35,6 +35,7 @@@ import org.apache.hadoop.ozone.OzoneAcl import org.apache.hadoop.ozone.om.OzoneManager; import org.apache.hadoop.ozone.om.OzoneManagerPrepareState; import org.apache.hadoop.ozone.om.exceptions.OMException; ++import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.DBUpdates; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyArgs; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
