You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by si...@apache.org on 2022/05/27 17:10:46 UTC
[ozone] branch HDDS-4944 updated (dcd17390be -> 1acaa82f34)
This is an automated email from the ASF dual-hosted git repository.
siyao pushed a change to branch HDDS-4944
in repository https://gitbox.apache.org/repos/asf/ozone.git
from dcd17390be HDDS-6701. [Multi-Tenant] Add proper locking between Ranger background sync service and tenant requests; bug fixes (#3450)
add 4f35293124 HDDS-6765. Get snapshot of write OMLockMetrics (#3427)
add 377be9644f HDDS-6476. Support FSO in OMOpenKeysDeleteRequest and Response (#3233)
add 77e53623ac HDDS-6648. Fix the inconsistency between network-topology-default.xml and network-topology-default.yaml(#3350)
add 1357a33df9 HDDS-6719. Verify build from source release tarball in CI (#3396)
add 94dd1ea7c5 HDDS-6771. EC: ReplicationManager - make ContainerReplicaPendingOps into a SCM service (#3445)
add 5ed0e0a9b4 HDDS-6323. Close RocksObject(s). (#3091)
add ddbe71d3f9 HDDS-6681. Post-Finalize behaviour for Bucket Layout feature. (#3411)
add 2222be3303 HDDS-6788. Sort Ozone list Status output for FSO buckets. (#3444)
new 1acaa82f34 Merge remote-tracking branch 'asf/master' into HDDS-4944
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 +-
.../BackgroundSCMService.java} | 213 +++++----
.../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, 2655 insertions(+), 554 deletions(-)
create mode 100644 hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDatabase.java
copy hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/{pipeline/BackgroundPipelineScrubber.java => ha/BackgroundSCMService.java} (53%)
create mode 100644 hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestBackgroundSCMService.java
create mode 100644 hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListStatus.java
create mode 100644 hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneListStatusHelper.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org
[ozone] 01/01: Merge remote-tracking branch 'asf/master' into HDDS-4944
Posted by si...@apache.org.
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 <50...@users.noreply.github.com>
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: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org