This is an automated email from the ASF dual-hosted git repository. ChenSammi pushed a commit to branch HDDS-8342 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 2ebf64de05cd9f0d7899945196b24fa937d9847b Merge: 3d6aa1bd0fc b18ea9284c4 Author: Sammi Chen <[email protected]> AuthorDate: Wed Jul 15 12:54:29 2026 +0800 Merge remote-tracking branch 'origin/master' into HDDS-8342-object-ttl .../hdds/scm/storage/StreamBlockInputStream.java | 9 +- .../scm/storage/TestStreamBlockInputStream.java | 156 +++++++++ .../commandhandler/DeleteBlocksCommandHandler.java | 7 + .../TestDeleteBlocksCommandHandler.java | 108 +++++++ ...achine.java => ContainerStateMachineTests.java} | 4 +- .../ratis/TestContainerStateMachineFollower.java | 2 +- .../ratis/TestContainerStateMachineLeader.java | 2 +- ...ersAbstract.java => ContainerScannerTests.java} | 2 +- .../TestBackgroundContainerDataScanner.java | 2 +- .../TestBackgroundContainerMetadataScanner.java | 2 +- .../ozoneimpl/TestOnDemandContainerScanner.java | 2 +- .../docs/content/design/efficient-snapdiff.md | 254 +++++++++++++++ .../{TestCoderBase.java => CoderTests.java} | 2 +- ...estRSRawCoderBase.java => RSRawCoderTests.java} | 4 +- .../{TestRawCoderBase.java => RawCoderTests.java} | 6 +- .../erasurecode/rawcoder/TestDummyRawCoder.java | 2 +- .../erasurecode/rawcoder/TestNativeRSRawCoder.java | 2 +- .../rawcoder/TestNativeXORRawCoder.java | 2 +- .../ozone/erasurecode/rawcoder/TestRSRawCoder.java | 2 +- .../erasurecode/rawcoder/TestXORRawCoder.java | 2 +- ...tXORRawCoderBase.java => XORRawCoderTests.java} | 4 +- .../org/apache/hadoop/hdds/utils/Archiver.java | 76 +++++ .../org/apache/hadoop/hdds/utils/TestArchiver.java | 40 +++ .../src/main/proto/ScmAdminProtocol.proto | 3 + .../interface-admin/src/main/resources/proto.lock | 18 ++ .../hadoop/hdds/scm/block/DeletedBlockLogImpl.java | 9 +- .../SCMDeletedBlockTransactionStatusManager.java | 123 +++++-- .../hdds/scm/container/ContainerManager.java | 4 +- .../hdds/scm/container/ContainerManagerImpl.java | 5 +- .../hdds/scm/container/ContainerStateManager.java | 5 +- .../scm/container/ContainerStateManagerImpl.java | 5 +- .../scm/container/balancer/ContainerBalancer.java | 19 +- .../balancer/ContainerBalancerStatusInfo.java | 43 ++- .../balancer/ContainerBalancerStopReason.java | 63 ++++ .../container/balancer/ContainerBalancerTask.java | 143 +++++--- .../scm/container/states/ContainerStateMap.java | 49 ++- .../ha/invoker/ContainerStateManagerInvoker.java | 83 ++--- .../hdds/scm/server/SCMClientProtocolServer.java | 15 +- .../hadoop/hdds/scm/block/TestDeletedBlockLog.java | 2 +- .../scm/container/TestContainerStateManager.java | 2 +- .../container/balancer/TestContainerBalancer.java | 43 +++ .../balancer/TestContainerBalancerStatusInfo.java | 66 ++++ .../balancer/TestContainerBalancerTask.java | 58 ++++ ...andler.java => MisReplicationHandlerTests.java} | 2 +- .../replication/TestECMisReplicationHandler.java | 2 +- .../TestRatisMisReplicationHandler.java | 2 +- .../container/states/TestContainerStateMap.java | 102 ++++-- .../scm/cli/ContainerBalancerStatusSubcommand.java | 133 +++++--- .../datanode/TestContainerBalancerSubCommand.java | 242 +++++++++++++- .../ozone/debug/replicas/ReplicasVerify.java | 112 ++++++- .../apache/hadoop/ozone/om/helpers/OmKeyInfo.java | 71 +++- .../ozone/om/helpers/OmMultipartAbortInfo.java | 42 ++- .../ozone/om/helpers/OmMultipartKeyInfo.java | 17 +- .../ozone/om/helpers/OmMultipartPartInfo.java | 22 ++ .../hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java | 44 ++- .../dist/src/main/compose/common/replicas-test.sh | 2 + hadoop-ozone/dist/src/main/compose/testlib.sh | 13 + hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 2 +- .../dist/src/main/compose/xcompat/clients.yaml | 4 +- hadoop-ozone/dist/src/main/compose/xcompat/lib.sh | 2 +- .../src/main/smoketest/balancer/testBalancer.robot | 2 +- .../hadoop/ozone/s3/awssdk/S3SDKTestUtils.java | 59 ++++ .../ozone/s3/awssdk/v1/AbstractS3SDKV1Tests.java | 169 +++++++++- .../ozone/s3/awssdk/v2/AbstractS3SDKV2Tests.java | 170 +++++++++- ...eldsBase.java => ConfigurationFieldsTests.java} | 8 +- .../hadoop/ozone/TestOzoneConfigurationFields.java | 4 +- .../client/rpc/TestFailureHandlingByClient.java | 13 +- ...tInputStreamBase.java => InputStreamTests.java} | 2 +- .../client/rpc/read/TestChunkInputStream.java | 2 +- .../ozone/client/rpc/read/TestKeyInputStream.java | 2 +- .../rpc/read/TestStreamBlockInputStream.java | 2 +- ...estDuplicateContainerDirScannerIntegration.java | 1 + ....java => ContainerScannerIntegrationTests.java} | 2 +- ...tBackgroundContainerDataScannerIntegration.java | 2 +- ...kgroundContainerMetadataScannerIntegration.java | 2 +- .../TestOnDemandContainerScannerIntegration.java | 2 +- ...estDataValidate.java => DataValidateTests.java} | 2 +- .../freon/TestDataValidateWithDummyContainers.java | 2 +- .../TestDataValidateWithSafeByteOperations.java | 2 +- .../TestDataValidateWithUnsafeByteOperations.java | 2 +- .../ozone/local/TestLocalOzoneClusterRuntime.java | 136 ++++++++ ...d.java => OzoneManagerHAFollowerReadTests.java} | 2 +- ...zoneManagerHA.java => OzoneManagerHATests.java} | 2 +- .../hadoop/ozone/om/TestAddRemoveOzoneManager.java | 2 +- ...stOzoneManagerHAFollowerReadWithAllRunning.java | 2 +- ...OzoneManagerHAFollowerReadWithStoppedNodes.java | 2 +- .../ozone/om/TestOzoneManagerHAWithAllRunning.java | 2 +- .../om/TestOzoneManagerHAWithStoppedNodes.java | 2 +- .../hadoop/ozone/om/TestOzoneManagerPrepare.java | 2 +- .../{TestOmSnapshot.java => OmSnapshotTests.java} | 4 +- .../snapshot/TestOmSnapshotFsoWithNativeLib.java | 2 +- .../TestOmSnapshotFsoWithoutNativeLib.java | 2 +- ...apshotFsoWithoutNativeLibWithLinkedBuckets.java | 2 +- .../om/snapshot/TestOmSnapshotObjectStore.java | 2 +- .../TestOmSnapshotWithoutBucketLinkingLegacy.java | 2 +- .../ozone/shell/TestOzoneDebugReplicasVerify.java | 136 ++++++++ .../src/main/proto/OmClientProtocol.proto | 4 + .../ozone/om/helpers/TestOmKeyInfoCodec.java | 132 +++++++- .../om/helpers/TestRepeatedOmKeyInfoCodec.java | 109 ++++++- .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 36 +++ .../hadoop/ozone/om/OmMetadataManagerImpl.java | 4 +- .../hadoop/ozone/om/codec/OMDBDefinition.java | 23 +- .../hadoop/ozone/om/request/OMClientRequest.java | 39 ++- .../om/request/key/OMAllocateBlockRequest.java | 4 +- .../ozone/om/request/key/OMKeyCommitRequest.java | 3 - .../om/request/key/OMKeyCommitRequestWithFSO.java | 4 +- .../ozone/om/request/key/OMKeyDeleteRequest.java | 2 +- .../ozone/om/request/key/OMKeyRenameRequest.java | 2 +- .../S3ExpiredMultipartUploadsAbortRequest.java | 42 ++- .../multipart/S3MultipartUploadAbortRequest.java | 42 ++- .../S3MultipartUploadAbortRequestWithFSO.java | 9 +- .../S3MultipartUploadCommitPartRequest.java | 74 ++++- .../S3MultipartUploadCommitPartRequestWithFSO.java | 8 +- .../S3MultipartUploadCompleteRequest.java | 78 +++-- .../S3MultipartUploadCompleteRequestWithFSO.java | 6 +- .../om/request/util/OMMultipartUploadUtils.java | 102 ++++++ .../AbstractS3MultipartAbortResponse.java | 53 ++- .../S3ExpiredMultipartUploadsAbortResponse.java | 3 +- .../multipart/S3MultipartUploadAbortResponse.java | 30 +- .../S3MultipartUploadAbortResponseWithFSO.java | 14 +- .../S3MultipartUploadCommitPartResponse.java | 23 +- ...S3MultipartUploadCommitPartResponseWithFSO.java | 8 +- .../S3MultipartUploadCompleteResponse.java | 15 +- .../S3MultipartUploadCompleteResponseWithFSO.java | 10 +- .../ozone/om/snapshot/SnapshotDiffValueParser.java | 359 +++++++++++++++++++++ .../hadoop/ozone/om/TestOmMetadataManager.java | 33 ++ .../TestOMClientRequestUserInfoFallback.java | 106 ------ .../om/request/key/TestOMKeyCommitRequest.java | 2 - .../TestS3MultipartUploadCommitPartRequest.java | 355 ++++++++++++++++++++ .../s3/multipart/S3MultipartResponseTests.java | 10 +- .../TestS3MultipartUploadAbortResponseWithFSO.java | 4 +- .../om/snapshot/TestSnapshotDiffValueParser.java | 249 ++++++++++++++ .../ozone/s3/commontypes/ObjectKeyNameAdapter.java | 3 +- .../ozone/s3/commontypes/RequestParameters.java | 11 + .../hadoop/ozone/s3/endpoint/BucketEndpoint.java | 12 +- .../ozone/s3/endpoint/ListBucketResponse.java | 13 +- .../hadoop/ozone/s3/endpoint/RootEndpoint.java | 41 ++- .../ozone/s3/signature/AWSSignatureProcessor.java | 7 +- .../signature/AccessDeniedResourceException.java | 11 +- .../s3/signature/AuthorizationV4QueryParser.java | 7 +- .../org/apache/hadoop/ozone/s3/util/S3Consts.java | 3 + .../org/apache/hadoop/ozone/s3/util/S3Utils.java | 11 + .../s3/commontypes/TestObjectKeyNameAdapter.java | 2 +- .../hadoop/ozone/s3/endpoint/TestBucketList.java | 38 ++- .../hadoop/ozone/s3/endpoint/TestRootList.java | 94 ++++++ .../s3/signature/TestAWSSignatureProcessor.java | 37 +++ .../signature/TestAuthorizationV4QueryParser.java | 16 +- hadoop-ozone/tools/pom.xml | 12 + .../hadoop/ozone/local/LocalOzoneCluster.java | 294 ++++++++++++++++- .../hadoop/ozone/local/TestLocalOzoneCluster.java | 9 +- 150 files changed, 5031 insertions(+), 603 deletions(-) diff --cc hadoop-ozone/integration-test-s3/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v2/AbstractS3SDKV2Tests.java index 4a66a428511,ecab86ed323..0b47e48ccfe --- a/hadoop-ozone/integration-test-s3/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v2/AbstractS3SDKV2Tests.java +++ b/hadoop-ozone/integration-test-s3/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v2/AbstractS3SDKV2Tests.java @@@ -141,9 -131,7 +141,10 @@@ import software.amazon.awssdk.services. import software.amazon.awssdk.services.s3.model.HeadBucketRequest; import software.amazon.awssdk.services.s3.model.HeadObjectRequest; import software.amazon.awssdk.services.s3.model.HeadObjectResponse; +import software.amazon.awssdk.services.s3.model.LifecycleRule; +import software.amazon.awssdk.services.s3.model.LifecycleRuleAndOperator; +import software.amazon.awssdk.services.s3.model.LifecycleRuleFilter; + import software.amazon.awssdk.services.s3.model.ListBucketsRequest; import software.amazon.awssdk.services.s3.model.ListBucketsResponse; import software.amazon.awssdk.services.s3.model.ListDirectoryBucketsRequest; import software.amazon.awssdk.services.s3.model.ListDirectoryBucketsResponse; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
