Skip to content

Commit eb56cbf

Browse files
committed
revert to disabling multipart client with S3 EC
1 parent 62f84d6 commit eb56cbf

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/DefaultS3ClientFactory.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
3939
import software.amazon.awssdk.regions.Region;
4040
import software.amazon.awssdk.services.s3.S3AsyncClient;
41+
import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
4142
import software.amazon.awssdk.services.s3.S3BaseClientBuilder;
4243
import software.amazon.awssdk.services.s3.S3Client;
4344
import software.amazon.awssdk.services.s3.S3Configuration;
@@ -145,11 +146,17 @@ public S3AsyncClient createS3AsyncClient(
145146
.thresholdInBytes(parameters.getMultiPartThreshold())
146147
.build();
147148

148-
return configureClientBuilder(S3AsyncClient.builder(), parameters, conf, bucket)
149-
.httpClientBuilder(httpClientBuilder)
150-
.multipartConfiguration(multipartConfiguration)
151-
.multipartEnabled(parameters.isMultipartCopy())
152-
.build();
149+
S3AsyncClientBuilder s3AsyncClientBuilder =
150+
configureClientBuilder(S3AsyncClient.builder(), parameters, conf, bucket).httpClientBuilder(
151+
httpClientBuilder);
152+
153+
if (!parameters.isClientSideEncryptionEnabled()) {
154+
s3AsyncClientBuilder
155+
.multipartConfiguration(multipartConfiguration)
156+
.multipartEnabled(parameters.isMultipartCopy());
157+
}
158+
159+
return s3AsyncClientBuilder.build();
153160
}
154161

155162
@Override

0 commit comments

Comments
 (0)