This is an automated email from the ASF dual-hosted git repository.
ChenSammi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
from 5bfa452f3e5 HDDS-15607. Return x-amz-meta-* user-defined object
metadata on S3 GetObject (#10785)
add 917e4b77062 Merge branch 'HDDS-8342' into master-merge-object-ttl
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/hadoop/ozone/OzoneConsts.java | 1 +
.../common/src/main/resources/ozone-default.xml | 60 +
...ocksdb.md => s3-object-lifecycle-management.md} | 18 +-
hadoop-hdds/docs/content/feature/Lifecycle.md | 394 ++++
hadoop-hdds/docs/content/feature/Lifecycle.zh.md | 393 ++++
hadoop-ozone/cli-admin/pom.xml | 4 +
.../ozone/admin/om/LifecycleResumeSubCommand.java} | 53 +-
.../ozone/admin/om/LifecycleStatusSubCommand.java | 89 +
.../admin/om/LifecycleSubCommand.java} | 30 +-
.../ozone/admin/om/LifecycleSuspendSubCommand.java | 76 +
.../org/apache/hadoop/ozone/admin/om/OMAdmin.java | 3 +-
.../apache/hadoop/ozone/client/OzoneBucket.java | 34 +
.../ozone/client/OzoneLifecycleConfiguration.java | 230 ++
.../ozone/client/protocol/ClientProtocol.java | 31 +
.../apache/hadoop/ozone/client/rpc/RpcClient.java | 34 +
.../apache/hadoop/fs/ozone/OzoneTrashPolicy.java | 2 +-
.../main/java/org/apache/hadoop/ozone/OmUtils.java | 11 +-
.../org/apache/hadoop/ozone/om/OMConfigKeys.java | 34 +
.../hadoop/ozone/om/exceptions/OMException.java | 3 +
.../OmLCAbortIncompleteMultipartUpload.java | 139 ++
.../apache/hadoop/ozone/om/helpers/OmLCAction.java | 59 +
.../hadoop/ozone/om/helpers/OmLCExpiration.java | 215 ++
.../apache/hadoop/ozone/om/helpers/OmLCFilter.java | 235 ++
.../apache/hadoop/ozone/om/helpers/OmLCRule.java | 404 ++++
.../ozone/om/helpers/OmLifecycleConfiguration.java | 334 +++
.../om/helpers/OmLifecycleRuleAndOperator.java | 214 ++
.../hadoop/ozone/om/helpers/OmLifecycleUtils.java | 131 ++
.../hadoop/ozone/om/helpers/OzoneFSUtils.java | 72 +
.../ozone/om/protocol/OzoneManagerProtocol.java | 65 +
...OzoneManagerProtocolClientSideTranslatorPB.java | 102 +
.../apache/hadoop/ozone/om/helpers/OMLCUtils.java | 131 ++
.../TestOmLCAbortIncompleteMultipartUpload.java | 171 ++
.../ozone/om/helpers/TestOmLCExpiration.java | 198 ++
.../hadoop/ozone/om/helpers/TestOmLCFilter.java | 159 ++
.../hadoop/ozone/om/helpers/TestOmLCRule.java | 426 ++++
.../om/helpers/TestOmLifeCycleConfiguration.java | 266 +++
.../om/helpers/TestOmLifecycleRuleAndOperator.java | 139 ++
.../src/main/compose/ozonesecure-ha/docker-config | 6 +
...st-s3g-virtual-host.sh => test-om-lifecycle.sh} | 10 +-
.../main/smoketest/lifecycle/om-lifecycle.robot | 119 +
.../src/main/smoketest/s3/bucketlifecycle.robot | 57 +
hadoop-ozone/integration-test-s3/pom.xml | 10 +
.../hadoop/ozone/s3/awssdk/OzoneS3SDKTests.java | 11 +
.../ozone/s3/awssdk/v1/AbstractS3SDKV1Tests.java | 330 +++
.../ozone/s3/awssdk/v2/AbstractS3SDKV2Tests.java | 205 ++
.../AbstractRootedOzoneFileSystemTestWithFSO.java | 3 +-
.../ozone/client/rpc/OzoneRpcClientTests.java | 197 ++
.../org/apache/hadoop/ozone/om/TestOmMetrics.java | 14 +-
.../ozone/om/service/TestRootedDDSWithFSO.java | 9 +-
.../hadoop/ozone/shell/TestOzoneShellHA.java | 76 +
.../src/main/proto/OmClientProtocol.proto | 155 +-
.../apache/hadoop/ozone/om/OMMetadataManager.java | 19 +
.../org/apache/hadoop/ozone/audit/OMAction.java | 8 +-
.../org/apache/hadoop/ozone/om/KeyManager.java | 7 +
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 36 +-
.../java/org/apache/hadoop/ozone/om/OMMetrics.java | 56 +
.../hadoop/ozone/om/OmMetadataManagerImpl.java | 69 +
.../org/apache/hadoop/ozone/om/OzoneManager.java | 71 +-
.../hadoop/ozone/om/TrashOzoneFileSystem.java | 1 +
.../hadoop/ozone/om/codec/OMDBDefinition.java | 38 +-
.../hadoop/ozone/om/helpers/OMAuditLogger.java | 1 +
.../om/ratis/utils/OzoneManagerRatisUtils.java | 9 +
.../om/request/bucket/OMBucketDeleteRequest.java | 12 +-
.../file/OMDirectoryCreateRequestWithFSO.java | 4 +-
.../key/OMDirectoriesPurgeRequestWithFSO.java | 2 +
.../om/request/key/OMKeyRenameRequestWithFSO.java | 8 +
.../ozone/om/request/key/OMKeysDeleteRequest.java | 71 +-
.../OMLifecycleConfigurationDeleteRequest.java | 194 ++
.../OMLifecycleConfigurationSetRequest.java | 223 ++
.../OMLifecycleSetServiceStatusRequest.java | 126 ++
.../ozone/om/request/lifecycle}/package-info.java | 4 +-
.../om/response/bucket/OMBucketDeleteResponse.java | 11 +-
.../OMLifecycleConfigurationDeleteResponse.java} | 42 +-
.../OMLifecycleConfigurationSetResponse.java} | 43 +-
.../OMLifecycleSetServiceStatusResponse.java} | 16 +-
.../ozone/om/response/lifecycle}/package-info.java | 4 +-
.../ozone/om/service/KeyLifecycleService.java | 1575 +++++++++++++
.../om/service/KeyLifecycleServiceMetrics.java | 196 ++
.../hadoop/ozone/om/upgrade/OMLayoutFeature.java | 3 +-
.../protocolPB/OzoneManagerRequestHandler.java | 34 +
.../apache/hadoop/ozone/om}/FaultInjectorImpl.java | 2 +-
.../hadoop/ozone/om/TestOmMetadataManager.java | 4 +-
.../om/request/key/TestOMKeysDeleteRequest.java | 158 +-
.../key/TestOMKeysDeleteRequestWithFSO.java | 77 +-
.../TestOMLifecycleConfigurationDeleteRequest.java | 194 ++
.../TestOMLifecycleConfigurationRequest.java | 153 ++
.../TestOMLifecycleConfigurationSetRequest.java | 284 +++
.../ozone/om/response/TestCleanupTableInfo.java | 2 +
...TestOMLifecycleConfigurationDeleteResponse.java | 117 +
.../TestOMLifecycleConfigurationSetResponse.java | 124 +
.../ozone/om/service/TestKeyLifecycleService.java | 2379 ++++++++++++++++++++
.../org/apache/hadoop/ozone/audit/S3GAction.java | 3 +
.../ozone/s3/endpoint/BucketCrudHandler.java | 127 ++
...tBucketLifecycleConfigurationUnmarshaller.java} | 56 +-
.../s3/endpoint/S3LifecycleConfiguration.java | 557 +++++
.../hadoop/ozone/s3/exception/S3ErrorTable.java | 3 +
.../org/apache/hadoop/ozone/s3/util/S3Consts.java | 1 +
.../hadoop/ozone/client/ClientProtocolStub.java | 18 +
.../hadoop/ozone/client/OzoneBucketStub.java | 68 +
.../hadoop/ozone/client/OzoneVolumeStub.java | 1 +
.../TestS3LifecycleConfigurationDelete.java | 100 +
.../endpoint/TestS3LifecycleConfigurationGet.java | 173 ++
.../endpoint/TestS3LifecycleConfigurationPut.java | 605 +++++
103 files changed, 14015 insertions(+), 236 deletions(-)
copy hadoop-hdds/docs/content/design/{dn-merge-rocksdb.md =>
s3-object-lifecycle-management.md} (59%)
create mode 100644 hadoop-hdds/docs/content/feature/Lifecycle.md
create mode 100644 hadoop-hdds/docs/content/feature/Lifecycle.zh.md
copy
hadoop-ozone/{cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaStatus.java
=>
cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/LifecycleResumeSubCommand.java}
(53%)
create mode 100644
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/LifecycleStatusSubCommand.java
copy
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/{hdds/scm/cli/datanode/DatanodeCommands.java
=> ozone/admin/om/LifecycleSubCommand.java} (66%)
create mode 100644
hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/LifecycleSuspendSubCommand.java
create mode 100644
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneLifecycleConfiguration.java
create mode 100644
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmLCAbortIncompleteMultipartUpload.java
create mode 100644
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmLCAction.java
create mode 100644
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmLCExpiration.java
create mode 100644
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmLCFilter.java
create mode 100644
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmLCRule.java
create mode 100644
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmLifecycleConfiguration.java
create mode 100644
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmLifecycleRuleAndOperator.java
create mode 100644
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmLifecycleUtils.java
create mode 100644
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/OMLCUtils.java
create mode 100644
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmLCAbortIncompleteMultipartUpload.java
create mode 100644
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmLCExpiration.java
create mode 100644
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmLCFilter.java
create mode 100644
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmLCRule.java
create mode 100644
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmLifeCycleConfiguration.java
create mode 100644
hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmLifecycleRuleAndOperator.java
copy
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/{test-s3g-virtual-host.sh =>
test-om-lifecycle.sh} (86%)
mode change 100755 => 100644
create mode 100644
hadoop-ozone/dist/src/main/smoketest/lifecycle/om-lifecycle.robot
create mode 100644
hadoop-ozone/dist/src/main/smoketest/s3/bucketlifecycle.robot
create mode 100644
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/lifecycle/OMLifecycleConfigurationDeleteRequest.java
create mode 100644
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/lifecycle/OMLifecycleConfigurationSetRequest.java
create mode 100644
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/lifecycle/OMLifecycleSetServiceStatusRequest.java
copy {hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage =>
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/lifecycle}/package-info.java
(86%)
copy
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/{volume/OMVolumeSetQuotaResponse.java
=> lifecycle/OMLifecycleConfigurationDeleteResponse.java} (59%)
copy
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/{volume/OMVolumeSetQuotaResponse.java
=> lifecycle/OMLifecycleConfigurationSetResponse.java} (54%)
copy
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/{util/OMEchoRPCWriteResponse.java
=> lifecycle/OMLifecycleSetServiceStatusResponse.java} (75%)
copy {hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage =>
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/lifecycle}/package-info.java
(86%)
create mode 100644
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/KeyLifecycleService.java
create mode 100644
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/KeyLifecycleServiceMetrics.java
copy hadoop-ozone/{integration-test/src/test/java/org/apache/hadoop/utils =>
ozone-manager/src/test/java/org/apache/hadoop/ozone/om}/FaultInjectorImpl.java
(98%)
create mode 100644
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationDeleteRequest.java
create mode 100644
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationRequest.java
create mode 100644
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/lifecycle/TestOMLifecycleConfigurationSetRequest.java
create mode 100644
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/lifecycle/TestOMLifecycleConfigurationDeleteResponse.java
create mode 100644
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/lifecycle/TestOMLifecycleConfigurationSetResponse.java
create mode 100644
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyLifecycleService.java
copy
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/{MessageUnmarshaller.java
=> PutBucketLifecycleConfigurationUnmarshaller.java} (52%)
create mode 100644
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3LifecycleConfiguration.java
create mode 100644
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestS3LifecycleConfigurationDelete.java
create mode 100644
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestS3LifecycleConfigurationGet.java
create mode 100644
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestS3LifecycleConfigurationPut.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
