HDDS-10979. Support STANDARD_IA S3 storage class to accept EC replication config. #8399
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| *** Settings *** | ||
| Documentation S3 gateway test with aws cli with STANDARD_IA storage class | ||
| Library OperatingSystem | ||
| Library String | ||
| Resource ../commonlib.robot | ||
| Resource ../s3/commonawslib.robot | ||
| Resource ../s3/mpu_lib.robot | ||
| Resource ../ozone-lib/shell.robot | ||
| Test Timeout 5 minutes | ||
| Suite Setup Setup EC Multipart Tests | ||
| Suite Teardown Teardown EC Multipart Tests | ||
| Test Setup Generate random prefix | ||
|
|
||
| *** Keywords *** | ||
| Setup EC Multipart Tests | ||
| Setup s3 tests | ||
| Create Random File KB 1023 /tmp/1mb | ||
|
|
||
| Teardown EC Multipart Tests | ||
| Remove Files /tmp/1mb | ||
|
|
||
| *** Variables *** | ||
| ${ENDPOINT_URL} http://s3g:9878 | ||
| ${BUCKET} generated | ||
|
|
||
| *** Test Cases *** | ||
|
|
||
| Put Object with STANDARD_IA storage class | ||
| ${file_checksum} = Execute md5sum /tmp/1mb | awk '{print $1}' | ||
|
|
||
| ${result} = Execute AWSS3ApiCli put-object --bucket ${BUCKET} --key ${PREFIX}/ecKey32 --body /tmp/1mb --storage-class STANDARD_IA | ||
| ${eTag} = Execute echo '${result}' | jq -r '.ETag' | ||
| Should Be Equal ${eTag} \"${file_checksum}\" | ||
| Verify Key EC Replication Config /s3v/${BUCKET}/${PREFIX}/ecKey32 RS 3 2 1048576 | ||
|
|
||
| ${result} = Execute AWSS3ApiCli put-object --bucket ${BUCKET} --key ${PREFIX}/ecKey63 --body /tmp/1mb --storage-class STANDARD_IA --metadata="storage-config=rs-6-3-1024k" | ||
| ${eTag} = Execute echo '${result}' | jq -r '.ETag' | ||
| Should Be Equal ${eTag} \"${file_checksum}\" | ||
| Verify Key EC Replication Config /s3v/${BUCKET}/${PREFIX}/ecKey63 RS 6 3 1048576 | ||
|
|
||
| Test multipart upload with STANDARD_IA storage | ||
| ${uploadID} = Initiate MPU ${BUCKET} ${PREFIX}/ecmultipartKey32 0 --storage-class STANDARD_IA | ||
| ${eTag1} = Upload MPU part ${BUCKET} ${PREFIX}/ecmultipartKey32 ${uploadID} 1 /tmp/1mb | ||
| ${result} = Execute AWSS3APICli list-parts --bucket ${BUCKET} --key ${PREFIX}/ecmultipartKey32 --upload-id ${uploadID} | ||
| ${part1} = Execute echo '${result}' | jq -r '.Parts[0].ETag' | ||
| Should Be equal ${part1} ${eTag1} | ||
| Should contain ${result} STANDARD_IA | ||
| Complete MPU ${BUCKET} ${PREFIX}/ecmultipartKey32 ${uploadID} {ETag=${eTag1},PartNumber=1} | ||
| Verify Key EC Replication Config /s3v/${BUCKET}/${PREFIX}/ecmultipartKey32 RS 3 2 1048576 | ||
|
|
||
| ${uploadID} = Initiate MPU ${BUCKET} ${PREFIX}/ecmultipartKey63 0 --storage-class STANDARD_IA --metadata="storage-config=rs-6-3-1024k" | ||
| ${eTag1} = Upload MPU part ${BUCKET} ${PREFIX}/ecmultipartKey63 ${uploadID} 1 /tmp/part1 | ||
| ${result} = Execute AWSS3APICli list-parts --bucket ${BUCKET} --key ${PREFIX}/ecmultipartKey63 --upload-id ${uploadID} | ||
| ${part1} = Execute echo '${result}' | jq -r '.Parts[0].ETag' | ||
| Should Be equal ${part1} ${eTag1} | ||
| Should contain ${result} STANDARD_IA | ||
| Complete MPU ${BUCKET} ${PREFIX}/ecmultipartKey63 ${uploadID} {ETag=${eTag1},PartNumber=1} | ||
| Verify Key EC Replication Config /s3v/${BUCKET}/${PREFIX}/ecmultipartKey63 RS 6 3 1048576 | ||
|
|
||
| Copy Object change storage class to STANDARD_IA | ||
| ${file_checksum} = Execute md5sum /tmp/1mb | awk '{print $1}' | ||
| ${result} = Execute AWSS3ApiCli put-object --bucket ${BUCKET} --key ${PREFIX}/copyobject/Key1 --body /tmp/1mb | ||
| ${eTag} = Execute echo '${result}' | jq -r '.ETag' | ||
| Should Be Equal ${eTag} \"${file_checksum}\" | ||
|
|
||
| ${result} = Execute AWSS3APICli copy-object --storage-class STANDARD_IA --bucket ${BUCKET} --key ${PREFIX}/copyobject/Key1 --copy-source ${BUCKET}/${PREFIX}/copyobject/Key1 | ||
| Should contain ${result} ETag | ||
| ${eTag} = Execute echo '${result}' | jq -r '.CopyObjectResult.ETag' | ||
| Should Be Equal ${eTag} \"${file_checksum}\" | ||
|
|
||
| ${result} = Execute AWSS3APICli copy-object --storage-class STANDARD_IA --metadata="storage-config=rs-6-3-1024k" --bucket ${BUCKET} --key ${PREFIX}/copyobject/Key1 --copy-source ${BUCKET}/${PREFIX}/copyobject/Key1 | ||
| Should contain ${result} ETag | ||
| ${eTag} = Execute echo '${result}' | jq -r '.CopyObjectResult.ETag' | ||
| Should Be Equal ${eTag} \"${file_checksum}\" | ||
| ## TODO: Verify Key EC Replication Config when we support changing storage class |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,12 +49,14 @@ | |
| import static org.apache.hadoop.ozone.s3.util.S3Consts.COPY_SOURCE_IF_MODIFIED_SINCE; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.COPY_SOURCE_IF_UNMODIFIED_SINCE; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.CUSTOM_METADATA_COPY_DIRECTIVE_HEADER; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.CUSTOM_METADATA_HEADER_PREFIX; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.CopyDirective; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.DECODED_CONTENT_LENGTH_HEADER; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.MP_PARTS_COUNT; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.RANGE_HEADER; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.RANGE_HEADER_SUPPORTED_UNIT; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CONFIG_HEADER; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.TAG_COUNT_HEADER; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Consts.TAG_DIRECTIVE_HEADER; | ||
| import static org.apache.hadoop.ozone.s3.util.S3Utils.urlDecode; | ||
|
|
@@ -230,7 +232,7 @@ public Response put( | |
| boolean auditSuccess = true; | ||
| PerformanceStringBuilder perf = new PerformanceStringBuilder(); | ||
|
|
||
| String copyHeader = null, storageType = null, storageConfig = null; | ||
| DigestInputStream digestInputStream = null; | ||
| try { | ||
| if (aclMarker != null) { | ||
|
|
@@ -256,12 +258,13 @@ public Response put( | |
|
|
||
| copyHeader = headers.getHeaderString(COPY_SOURCE_HEADER); | ||
| storageType = headers.getHeaderString(STORAGE_CLASS_HEADER); | ||
| storageConfig = headers.getHeaderString(CUSTOM_METADATA_HEADER_PREFIX + STORAGE_CONFIG_HEADER); | ||
|
Contributor
There was a problem hiding this comment. curious: how will a client add the header to the request? is it supported by s3 cli or hadoop aws cloud connector? i wonder where we add this information in the developer doc.
Contributor
Author
There was a problem hiding this comment. All s3 clients should support it. They would just need to add the "x-amz-metadata-storage-class=" to their requests. |
||
| boolean storageTypeDefault = StringUtils.isEmpty(storageType); | ||
|
|
||
| // Normal put object | ||
| OzoneBucket bucket = volume.getBucket(bucketName); | ||
| ReplicationConfig replicationConfig = | ||
| getReplicationConfig(bucket, storageType, storageConfig); | ||
|
|
||
| boolean enableEC = false; | ||
| if ((replicationConfig != null && | ||
|
|
@@ -817,14 +820,15 @@ public Response initializeMultipartUpload( | |
| try { | ||
| OzoneBucket ozoneBucket = getBucket(bucket); | ||
| String storageType = headers.getHeaderString(STORAGE_CLASS_HEADER); | ||
| String storageConfig = headers.getHeaderString(CUSTOM_METADATA_HEADER_PREFIX + STORAGE_CONFIG_HEADER); | ||
|
|
||
| Map<String, String> customMetadata = | ||
| getCustomMetadataFromHeaders(headers.getRequestHeaders()); | ||
|
|
||
| Map<String, String> tags = getTaggingFromHeaders(headers); | ||
|
|
||
| ReplicationConfig replicationConfig = | ||
| getReplicationConfig(ozoneBucket, storageType, storageConfig); | ||
|
|
||
| OmMultipartInfo multipartInfo = | ||
| ozoneBucket.initiateMultipartUpload(key, replicationConfig, customMetadata, tags); | ||
|
|
@@ -857,21 +861,20 @@ public Response initializeMultipartUpload( | |
| } | ||
|
|
||
| private ReplicationConfig getReplicationConfig(OzoneBucket ozoneBucket, | ||
| String storageType, String storageConfig) throws OS3Exception { | ||
|
|
||
| ReplicationConfig clientConfiguredReplicationConfig = null; | ||
| String replication = ozoneConfiguration.get(OZONE_REPLICATION); | ||
|
|
||
| if (replication != null) { | ||
| ReplicationType replicationType = ReplicationType.valueOf( | ||
| ozoneConfiguration.get(OZONE_REPLICATION_TYPE, OZONE_REPLICATION_TYPE_DEFAULT)); | ||
| clientConfiguredReplicationConfig = | ||
| (replicationType == ReplicationType.EC) ? | ||
| new ECReplicationConfig(replication) : ReplicationConfig.parse( | ||
| replicationType, replication, ozoneConfiguration); | ||
| } | ||
adoroszlai marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return S3Utils.resolveS3ClientSideReplicationConfig(storageType, storageConfig, | ||
| clientConfiguredReplicationConfig, ozoneBucket.getReplicationConfig()); | ||
| } | ||
|
|
||
|
|
@@ -974,9 +977,10 @@ private Response createMultipartKey(OzoneVolume volume, String bucket, | |
|
|
||
| copyHeader = headers.getHeaderString(COPY_SOURCE_HEADER); | ||
| String storageType = headers.getHeaderString(STORAGE_CLASS_HEADER); | ||
| String storageConfig = headers.getHeaderString(CUSTOM_METADATA_HEADER_PREFIX + STORAGE_CONFIG_HEADER); | ||
| final OzoneBucket ozoneBucket = volume.getBucket(bucket); | ||
| ReplicationConfig replicationConfig = | ||
| getReplicationConfig(ozoneBucket, storageType, storageConfig); | ||
|
|
||
| boolean enableEC = false; | ||
| if ((replicationConfig != null && | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,67 +18,34 @@ | |
| package org.apache.hadoop.ozone.s3.util; | ||
|
|
||
| import org.apache.hadoop.hdds.client.ECReplicationConfig; | ||
| import org.apache.hadoop.hdds.client.RatisReplicationConfig; | ||
| import org.apache.hadoop.hdds.client.ReplicationConfig; | ||
| import org.apache.hadoop.hdds.protocol.proto.HddsProtos; | ||
|
|
||
| /** | ||
| * Maps S3 storage class values to Ozone replication values. | ||
| */ | ||
|
|
||
| public enum S3StorageType { | ||
|
|
||
| REDUCED_REDUNDANCY(RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.ONE)), | ||
| STANDARD( | ||
| RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.THREE)), | ||
| STANDARD_IA(new ECReplicationConfig(ECReplicationConfig.EcCodec.RS + "-3-2-1024k")); | ||
adoroszlai marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| private final ReplicationConfig replicationConfig; | ||
|
|
||
| S3StorageType(ReplicationConfig replicationConfig) { | ||
| this.replicationConfig = replicationConfig; | ||
| } | ||
|
|
||
| public ReplicationConfig getReplicationConfig() { | ||
| return replicationConfig; | ||
| } | ||
|
|
||
| public static S3StorageType fromReplicationConfig(ReplicationConfig config) { | ||
| if (config.getReplicationType() == HddsProtos.ReplicationType.EC) { | ||
| return STANDARD_IA; | ||
|
Contributor
There was a problem hiding this comment. map EC type to STANDARD_IA.
Contributor
Author
There was a problem hiding this comment. This is done here. STANDARD_IA is mapped to EC/RS-3-2-1024k by default. |
||
| } | ||
| if (config.getReplicationType() == HddsProtos.ReplicationType.STAND_ALONE || | ||
| config.getRequiredNodes() == 1) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.