[CELEBORN-1530] support MPU for S3 #2830
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -209,25 +209,5 @@ | |
| </dependency> | ||
| </dependencies> | ||
| </profile> | ||
| </profiles> | ||
| </project> | ||
This file contains 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 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 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 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 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 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,82 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ 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. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.apache.celeborn</groupId> | ||
| <artifactId>celeborn-parent_${scala.binary.version}</artifactId> | ||
| <version>${project.version}</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>celeborn-multipart-uploader_${scala.binary.version}</artifactId> | ||
| <packaging>jar</packaging> | ||
| <name>Celeborn Multipart Uploader</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.logging.log4j</groupId> | ||
| <artifactId>log4j-slf4j-impl</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.logging.log4j</groupId> | ||
| <artifactId>log4j-1.2-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.logging.log4j</groupId> | ||
| <artifactId>log4j-1.2-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.celeborn</groupId> | ||
| <artifactId>celeborn-service_${scala.binary.version}</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <profiles> | ||
| <profile> | ||
| <id>aws-mpu</id> | ||
|
There was a problem hiding this comment. The profile name can be changed to aws. |
||
| <activation> | ||
| <property> | ||
| <name>aws-mpu-deps</name> | ||
| </property> | ||
| </activation> | ||
| <dependencies> | ||
|
There was a problem hiding this comment. I think these dependencies can be moved to dependencies section because this module is loaded when aws-mpu profile is activated only. |
||
| <dependency> | ||
| <groupId>org.apache.hadoop</groupId> | ||
| <artifactId>hadoop-aws</artifactId> | ||
| <version>${hadoop.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.amazonaws</groupId> | ||
| <artifactId>aws-java-sdk-bundle</artifactId> | ||
| <version>${aws.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| </profile> | ||
| </profiles> | ||
| </project> | ||
This file contains 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,136 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| package org.apache.celeborn; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.io.InputStream; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import com.amazonaws.ClientConfiguration; | ||
| import com.amazonaws.auth.AWSStaticCredentialsProvider; | ||
| import com.amazonaws.auth.BasicAWSCredentials; | ||
| import com.amazonaws.retry.PredefinedRetryPolicies; | ||
| import com.amazonaws.services.s3.AmazonS3; | ||
| import com.amazonaws.services.s3.AmazonS3ClientBuilder; | ||
| import com.amazonaws.services.s3.model.AbortMultipartUploadRequest; | ||
| import com.amazonaws.services.s3.model.CompleteMultipartUploadRequest; | ||
| import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest; | ||
| import com.amazonaws.services.s3.model.InitiateMultipartUploadResult; | ||
| import com.amazonaws.services.s3.model.ListPartsRequest; | ||
| import com.amazonaws.services.s3.model.ObjectMetadata; | ||
| import com.amazonaws.services.s3.model.PartETag; | ||
| import com.amazonaws.services.s3.model.PartListing; | ||
| import com.amazonaws.services.s3.model.PartSummary; | ||
| import com.amazonaws.services.s3.model.PutObjectRequest; | ||
| import com.amazonaws.services.s3.model.UploadPartRequest; | ||
|
|
||
| import org.apache.celeborn.server.common.service.mpu.MultipartUploadHandler; | ||
| import org.apache.celeborn.server.common.service.mpu.bean.AWSCredentials; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
|
|
||
| public class S3MultipartUploadHandler implements MultipartUploadHandler { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(S3MultipartUploadHandler.class); | ||
|
|
||
| private final AWSCredentials awsCredentials; | ||
| private String uploadId; | ||
| private AmazonS3 s3Client; | ||
| private String key; | ||
|
|
||
| public S3MultipartUploadHandler(AWSCredentials awsCredentials, String key) { | ||
| this.awsCredentials = awsCredentials; | ||
| BasicAWSCredentials basicAWSCredentials = | ||
| new BasicAWSCredentials(awsCredentials.getS3AccessKey(), awsCredentials.getS3SecretKey()); | ||
| ClientConfiguration clientConfig = new ClientConfiguration() | ||
| .withRetryPolicy(PredefinedRetryPolicies.getDefaultRetryPolicyWithCustomMaxRetries(5)) | ||
| .withMaxErrorRetry(5) | ||
| .withConnectionTimeout(10000) | ||
| .withRequestTimeout(50000); | ||
| this.s3Client = | ||
| AmazonS3ClientBuilder.standard() | ||
| .withCredentials(new AWSStaticCredentialsProvider(basicAWSCredentials)) | ||
| .withRegion(awsCredentials.getS3EndpointRegion()) | ||
| .withClientConfiguration(clientConfig) | ||
| .build(); | ||
| this.key = key; | ||
| } | ||
|
|
||
| @Override | ||
| public void startUpload() { | ||
| InitiateMultipartUploadRequest initRequest = | ||
| new InitiateMultipartUploadRequest(awsCredentials.getBucketName(), key); | ||
| InitiateMultipartUploadResult initResponse = s3Client.initiateMultipartUpload(initRequest); | ||
| uploadId = initResponse.getUploadId(); | ||
| } | ||
|
|
||
| @Override | ||
| public void putPart(InputStream inputStream, Long lengthInBytes, Integer partNumber) { | ||
| try { | ||
| UploadPartRequest uploadRequest = | ||
| new UploadPartRequest() | ||
| .withBucketName(awsCredentials.getBucketName()) | ||
| .withKey(key) | ||
| .withUploadId(uploadId) | ||
| .withPartNumber(partNumber) | ||
| .withInputStream(inputStream) | ||
| .withPartSize(lengthInBytes); | ||
| s3Client.uploadPart(uploadRequest); | ||
| } catch (RuntimeException e) { | ||
| logger.error("Failed to upload part", e); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void complete() { | ||
| List<PartETag> partETags = new ArrayList<>(); | ||
| ListPartsRequest listPartsRequest = new ListPartsRequest(awsCredentials.getBucketName(), key, uploadId); | ||
| PartListing partListing; | ||
| do { | ||
| partListing = s3Client.listParts(listPartsRequest); | ||
| for (PartSummary part : partListing.getParts()) { | ||
| partETags.add(new PartETag(part.getPartNumber(), part.getETag())); | ||
| } | ||
| listPartsRequest.setPartNumberMarker(partListing.getNextPartNumberMarker()); | ||
| } while (partListing.isTruncated()); | ||
| if (partETags.size() == 0) { | ||
| logger.debug("UploadId {} has no parts uploaded, aborting upload", uploadId); | ||
| abort(); | ||
| ObjectMetadata metadata = new ObjectMetadata(); | ||
| metadata.setContentLength(0); | ||
| PutObjectRequest putRequest = new PutObjectRequest(awsCredentials.getBucketName(), key, new ByteArrayInputStream(new byte[0]), metadata); | ||
| s3Client.putObject(putRequest); | ||
| return; | ||
| } | ||
| CompleteMultipartUploadRequest compRequest = | ||
| new CompleteMultipartUploadRequest( | ||
| awsCredentials.getBucketName(), key, uploadId, partETags); | ||
| logger.debug("UploadId {} upload completing and partSize is {}", uploadId, partETags.size()); | ||
| s3Client.completeMultipartUpload(compRequest); | ||
| } | ||
|
|
||
| @Override | ||
| public void abort() { | ||
| AbortMultipartUploadRequest abortMultipartUploadRequest = | ||
| new AbortMultipartUploadRequest(awsCredentials.getBucketName(), key, uploadId); | ||
| s3Client.abortMultipartUpload(abortMultipartUploadRequest); | ||
| } | ||
| } |
This file contains 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.
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.
This dependency is duplicated.