Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add S3 path style access support to exchange spooling #14655

Merged
merged 1 commit into from
Oct 17, 2022
Merged

Add S3 path style access support to exchange spooling #14655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ...nge-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public class ExchangeS3Config
private int asyncClientConcurrency = 100;
private int asyncClientMaxPendingConnectionAcquires = 10000;
private Duration connectionAcquisitionTimeout = new Duration(1, MINUTES);
private boolean s3PathStyleAccess;
private Optional<String> gcsJsonKeyFilePath = Optional.empty();
private Optional<String> gcsJsonKey = Optional.empty();

Expand Down Expand Up @@ -223,6 +224,19 @@ public ExchangeS3Config setConnectionAcquisitionTimeout(Duration connectionAcqui
return this;
}

public boolean isS3PathStyleAccess()
{
return s3PathStyleAccess;
}

@Config("exchange.s3.path-style-access")
@ConfigDescription("Use path-style access for all request to S3")
public ExchangeS3Config setS3PathStyleAccess(boolean s3PathStyleAccess)
{
this.s3PathStyleAccess = s3PathStyleAccess;
return this;
}

public Optional<String> getGcsJsonKeyFilePath()
{
return gcsJsonKeyFilePath;
Expand Down
6 changes: 6 additions & 0 deletions ...tem/src/main/java/io/trino/plugin/exchange/filesystem/s3/S3FileSystemExchangeStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.S3ClientBuilder;
import software.amazon.awssdk.services.s3.S3Configuration;
import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.AbortMultipartUploadResponse;
import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
Expand Down Expand Up @@ -171,6 +172,7 @@ public S3FileSystemExchangeStorage(S3FileSystemExchangeStorageStats stats, Excha
S3AsyncClient client = createS3AsyncClient(
credentialsProvider,
overrideConfig,
config.isS3PathStyleAccess(),
config.getAsyncClientConcurrency(),
config.getAsyncClientMaxPendingConnectionAcquires(),
config.getConnectionAcquisitionTimeout());
Expand Down Expand Up @@ -471,13 +473,17 @@ private S3Client createS3Client(AwsCredentialsProvider credentialsProvider, Clie
private S3AsyncClient createS3AsyncClient(
AwsCredentialsProvider credentialsProvider,
ClientOverrideConfiguration overrideConfig,
boolean isS3PathStyleAccess,
int maxConcurrency,
int maxPendingConnectionAcquires,
Duration connectionAcquisitionTimeout)
{
S3AsyncClientBuilder clientBuilder = S3AsyncClient.builder()
.credentialsProvider(credentialsProvider)
.overrideConfiguration(overrideConfig)
.serviceConfiguration(S3Configuration.builder()
.pathStyleAccessEnabled(isS3PathStyleAccess)
.build())
.httpClientBuilder(NettyNioAsyncHttpClient.builder()
.maxConcurrency(maxConcurrency)
.maxPendingConnectionAcquires(maxPendingConnectionAcquires)
Expand Down
3 changes: 3 additions & 0 deletions ...filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestExchangeS3Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public void testDefaults()
.setAsyncClientConcurrency(100)
.setAsyncClientMaxPendingConnectionAcquires(10000)
.setConnectionAcquisitionTimeout(new Duration(1, MINUTES))
.setS3PathStyleAccess(false)
.setGcsJsonKeyFilePath(null)
.setGcsJsonKey(null));
}
Expand All @@ -68,6 +69,7 @@ public void testExplicitPropertyMappings()
.put("exchange.s3.async-client-concurrency", "202")
.put("exchange.s3.async-client-max-pending-connection-acquires", "999")
.put("exchange.s3.async-client-connection-acquisition-timeout", "5m")
.put("exchange.s3.path-style-access", "true")
.put("exchange.gcs.json-key-file-path", "/path/to/gcs_keyfile.json")
.put("exchange.gcs.json-key", "{}")
.buildOrThrow();
Expand All @@ -86,6 +88,7 @@ public void testExplicitPropertyMappings()
.setAsyncClientConcurrency(202)
.setAsyncClientMaxPendingConnectionAcquires(999)
.setConnectionAcquisitionTimeout(new Duration(5, MINUTES))
.setS3PathStyleAccess(true)
.setGcsJsonKeyFilePath("/path/to/gcs_keyfile.json")
.setGcsJsonKey("{}");

Expand Down