From 2c9870dd48cf8332e3b9e65d7a541400b0127999 Mon Sep 17 00:00:00 2001 From: ashutoshpant <51799223+ashutoshpant@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:59:56 -0400 Subject: [PATCH 1/2] Added path to client creation parameters --- .../apache/hadoop/fs/s3a/S3AFileSystem.java | 1 + .../apache/hadoop/fs/s3a/S3ClientFactory.java | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java index 40671e0d334cc..032b482d6f6b1 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java @@ -888,6 +888,7 @@ private void bindAWSClient(URI name, boolean dtEnabled) throws IOException { S3ClientFactory.S3ClientCreationParameters parameters = null; parameters = new S3ClientFactory.S3ClientCreationParameters() .withCredentialSet(credentials) + .withPath(name) .withEndpoint(endpoint) .withMetrics(statisticsContext.newStatisticsFromAwsSdk()) .withPathStyleAccess(conf.getBoolean(PATH_STYLE_ACCESS, false)) diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java index 34674c788901f..b70681d6b8bcb 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java @@ -115,6 +115,11 @@ final class S3ClientCreationParameters { */ private String userAgentSuffix = ""; + /** + * Path + */ + private URI pathUri = ""; + /** * List of request handlers to include in the chain * of request execution in the SDK. @@ -214,7 +219,23 @@ public S3ClientCreationParameters withUserAgentSuffix( return this; } - public String getEndpoint() { + /** + * Set path. + * @param value new value + * @return the path + */ + + public S3ClientCreationParameters withPath( + final URI value) { + pathUri = value; + return this; + } + + public URI getPath() { + return pathUri; + } + + public String getEndpoint() { return endpoint; } From dbec319b0a2ae45aca0cf9e2f7208a2f316d5bfc Mon Sep 17 00:00:00 2001 From: ashutoshpant <51799223+ashutoshpant@users.noreply.github.com> Date: Tue, 12 Jul 2022 09:22:53 -0400 Subject: [PATCH 2/2] fixed javadoc style and indentation --- .../main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java index b70681d6b8bcb..8ab2ee19f8a4a 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java @@ -116,7 +116,7 @@ final class S3ClientCreationParameters { private String userAgentSuffix = ""; /** - * Path + * Path to s3a bucket. */ private URI pathUri = ""; @@ -235,7 +235,7 @@ public URI getPath() { return pathUri; } - public String getEndpoint() { + public String getEndpoint() { return endpoint; }