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 |
|---|---|---|
|
|
@@ -29,7 +29,6 @@ | |
| import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_DATASTREAM_AUTO_THRESHOLD_DEFAULT; | ||
| import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_REPLICATION; | ||
| import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_REPLICATION_TYPE; | ||
| import static org.apache.hadoop.ozone.audit.AuditLogger.PerformanceStringBuilder; | ||
| import static org.apache.hadoop.ozone.s3.S3GatewayConfigKeys.OZONE_S3G_CLIENT_BUFFER_SIZE_DEFAULT; | ||
| import static org.apache.hadoop.ozone.s3.S3GatewayConfigKeys.OZONE_S3G_CLIENT_BUFFER_SIZE_KEY; | ||
|
|
@@ -49,12 +48,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 +231,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 +257,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 && | ||
|
|
@@ -812,14 +814,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); | ||
|
|
@@ -852,21 +855,20 @@ public Response initializeMultipartUpload( | |
| } | ||
|
|
||
| private ReplicationConfig getReplicationConfig(OzoneBucket ozoneBucket, | ||
| String storageType, String storageConfig) throws OS3Exception { | ||
|
|
||
| ReplicationConfig clientConfiguredReplicationConfig = null; | ||
| ReplicationType replicationType = ReplicationType.valueOf( | ||
| ozoneConfiguration.get(OZONE_REPLICATION_TYPE)); | ||
| String replication = ozoneConfiguration.get(OZONE_REPLICATION); | ||
|
|
||
| if (replication != null) { | ||
| clientConfiguredReplicationConfig = | ||
| (replicationType == ReplicationType.EC) ? | ||
| new ECReplicationConfig(replication) : ReplicationConfig.parse( | ||
| replicationType, replication, ozoneConfiguration); | ||
| } | ||
| return S3Utils.resolveS3ClientSideReplicationConfig(storageType, storageConfig, | ||
| clientConfiguredReplicationConfig, ozoneBucket.getReplicationConfig()); | ||
| } | ||
|
|
||
|
|
@@ -969,9 +971,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 |
|---|---|---|
|
|
@@ -21,27 +21,29 @@ | |
| import org.apache.hadoop.hdds.client.ReplicationConfig; | ||
| import org.apache.hadoop.hdds.client.ReplicationFactor; | ||
| import org.apache.hadoop.hdds.client.ReplicationType; | ||
| import org.apache.hadoop.hdds.protocol.proto.HddsProtos; | ||
|
|
||
| /** | ||
| * Maps S3 storage class values to Ozone replication values. | ||
| */ | ||
|
|
||
| public enum S3StorageType { | ||
|
|
||
| REDUCED_REDUNDANCY(ReplicationType.RATIS, ReplicationFactor.ONE, null), | ||
| STANDARD(ReplicationType.RATIS, ReplicationFactor.THREE, null), | ||
| STANDARD_IA(ReplicationType.EC, null, ECReplicationConfig.EcCodec.RS + "-3-2-1024k"); | ||
|
|
||
| private final ReplicationType type; | ||
| private final ReplicationFactor factor; | ||
| private final String ecReplicationString; | ||
|
|
||
| S3StorageType( | ||
| ReplicationType type, | ||
| ReplicationFactor factor, | ||
| String ecReplicationString) { | ||
|
adoroszlai marked this conversation as resolved.
Outdated
|
||
| this.type = type; | ||
| this.factor = factor; | ||
| this.ecReplicationString = ecReplicationString; | ||
| } | ||
|
|
||
| public ReplicationFactor getFactor() { | ||
|
|
@@ -52,33 +54,13 @@ public ReplicationType getType() { | |
| return type; | ||
| } | ||
|
|
||
| public String getEcReplicationString() { | ||
| return ecReplicationString; | ||
| } | ||
|
|
||
| public static S3StorageType fromReplicationConfig(ReplicationConfig config) { | ||
| if (config instanceof ECReplicationConfig) { | ||
| 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) { | ||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what does this mean
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We store any x-amz-meta-key=value for an object in KeyArgs.metadata (or ex., Etag). ^^This will exclude storing EC storage config in the metadata because it will be available in replication config. We only want to use this header to determine EC replication config when client uses STANDARD_IA storage class.