FMX commented on code in PR #2830: URL: https://github.com/apache/celeborn/pull/2830#discussion_r1814355367
########## multipart-uploader/pom.xml: ########## @@ -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> + <activation> + <property> + <name>aws-mpu-deps</name> + </property> + </activation> + <dependencies> Review Comment: I think these dependencies can be moved to dependencies section because this module is loaded when aws-mpu profile is activated only. ########## multipart-uploader/pom.xml: ########## @@ -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> Review Comment: This dependency is duplicated. ########## worker/src/main/java/org/apache/celeborn/service/deploy/worker/storage/PartitionDataWriter.java: ########## @@ -273,6 +310,7 @@ public void flush(boolean finalFlush, boolean fromEvict) throws IOException { if (task != null) { addTask(task); flushBuffer = null; + partNumber++; Review Comment: This line can be removed ########## worker/src/main/java/org/apache/celeborn/service/deploy/worker/storage/PartitionDataWriter.java: ########## @@ -302,6 +340,11 @@ public void write(ByteBuf data) throws IOException { throw new AlreadyClosedException(msg); } + if (notifier.hasException() && s3MultipartUploadHandler != null) { + logger.warn("Abort s3 multipart upload for {}", diskFileInfo.getFilePath()); + s3MultipartUploadHandler.complete(); + } + if (notifier.hasException()) { Review Comment: These two if blocks can be merged. ########## service/src/main/java/org/apache/celeborn/server/common/service/mpu/bean/AWSCredentials.java: ########## @@ -0,0 +1,87 @@ +/* + * 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.server.common.service.mpu.bean; + +public class AWSCredentials { Review Comment: This class should not be in the common module. ########## worker/pom.xml: ########## @@ -141,4 +141,22 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>aws-mpu</id> + <activation> + <property> + <name>aws-mpu-deps</name> + </property> + </activation> Review Comment: This segment is not needed. ``` <activation> <property> <name>aws-mpu-deps</name> </property> </activation> ``` ########## multipart-uploader/pom.xml: ########## @@ -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> Review Comment: The profile name can be changed to aws. ########## worker/src/main/java/org/apache/celeborn/service/deploy/worker/storage/PartitionDataWriter.java: ########## @@ -264,7 +299,9 @@ public void flush(boolean finalFlush, boolean fromEvict) throws IOException { } else if (diskFileInfo.isHdfs()) { task = new HdfsFlushTask(flushBuffer, diskFileInfo.getDfsPath(), notifier, true); } else if (diskFileInfo.isS3()) { - task = new S3FlushTask(flushBuffer, diskFileInfo.getDfsPath(), notifier, true); + task = + new S3FlushTask( + flushBuffer, notifier, true, s3MultipartUploadHandler, partNumber); Review Comment: ```suggestion flushBuffer, notifier, true, s3MultipartUploadHandler, partNumber++); ``` ########## worker/src/main/scala/org/apache/celeborn/service/deploy/worker/MultipartUploadRequestParam.scala: ########## @@ -0,0 +1,32 @@ +/* + * 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.service.deploy.worker + +import java.lang.{Long => JLong} +import java.util.{List => JList} + +case class MultipartUploadRequestParam( Review Comment: Unused class. Can be removed. ########## worker/src/main/java/org/apache/celeborn/service/deploy/worker/storage/PartitionDataWriter.java: ########## @@ -187,6 +196,31 @@ public void initFileChannelsForDiskFile() throws IOException { // If we reuse DFS output stream, we will exhaust the memory soon. try { hadoopFs.create(this.diskFileInfo.getDfsPath(), true).close(); + if (diskFileInfo.isS3()) { + Configuration configuration = hadoopFs.getConf(); + String s3AccessKey = configuration.get("fs.s3a.access.key"); + String s3SecretKey = configuration.get("fs.s3a.secret.key"); + String s3EndpointRegion = configuration.get("fs.s3a.endpoint.region"); + + URI uri = hadoopFs.getUri(); + String bucketName = uri.getHost(); + int slashIndex = diskFileInfo.getFilePath().indexOf("/"); + String key = diskFileInfo.getFilePath().substring(slashIndex + 1); + + AWSCredentials awsCredentials = + new AWSCredentials(bucketName, s3AccessKey, s3SecretKey, s3EndpointRegion); + this.s3MultipartUploadHandler = + (MultipartUploadHandler) + DynConstructors.builder() + .impl( + "org.apache.celeborn.S3MultipartUploadHandler", + awsCredentials.getClass(), Review Comment: Pass the arguments to `S3MultipartUploadHandler` should be enough for this scenerio. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
