You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2022/07/16 17:20:29 UTC
[hadoop] branch branch-3.3.3 updated: Revert "HADOOP-18330. S3AFileSystem removes Path when calling createS3Client (#4557)"
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3.3 by this push:
new 15621e34155 Revert "HADOOP-18330. S3AFileSystem removes Path when calling createS3Client (#4557)"
15621e34155 is described below
commit 15621e34155ff41b3bfaefec066cde2b37eaff64
Author: Steve Loughran <st...@cloudera.com>
AuthorDate: Sat Jul 16 17:53:37 2022 +0100
Revert "HADOOP-18330. S3AFileSystem removes Path when calling createS3Client (#4557)"
(hadn't realised the PR was against 3.3.3)
This reverts commit 1c7b0bc5f47025d305d7654f9bcc06148c62aa7a.
---
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 1 -
.../org/apache/hadoop/fs/s3a/S3ClientFactory.java | 27 ----------------------
.../hadoop/fs/s3a/ITestS3AEndpointRegion.java | 1 -
.../ITestSessionDelegationInFileystem.java | 1 -
4 files changed, 30 deletions(-)
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 86b9319ca1a..5219b04f179 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,7 +888,6 @@ public class S3AFileSystem extends FileSystem implements StreamCapabilities,
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 6ff239c6d82..5ef99ed6f5c 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,12 +115,6 @@ public interface S3ClientFactory {
*/
private String userAgentSuffix = "";
- /**
- * S3A path.
- * added in HADOOP-18330
- */
- private URI pathUri;
-
/**
* List of request handlers to include in the chain
* of request execution in the SDK.
@@ -270,26 +264,5 @@ public interface S3ClientFactory {
public Map<String, String> getHeaders() {
return headers;
}
-
- /**
- * Get the full s3 path.
- * added in HADOOP-18330
- * @return path URI
- */
- public URI getPath() {
- return pathUri;
- }
-
- /**
- * Set full s3a path.
- * added in HADOOP-18330
- * @param value new value
- * @return the builder
- */
- public S3ClientCreationParameters withPath(
- final URI value) {
- pathUri = value;
- return this;
- }
}
}
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AEndpointRegion.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AEndpointRegion.java
index db19a6bb858..761dd558063 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AEndpointRegion.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AEndpointRegion.java
@@ -176,7 +176,6 @@ public class ITestS3AEndpointRegion extends AbstractS3ATestBase {
S3ClientFactory.S3ClientCreationParameters parameters
= new S3ClientFactory.S3ClientCreationParameters()
.withCredentialSet(new AnonymousAWSCredentialsProvider())
- .withPath(new URI("s3a://localhost/"))
.withEndpoint(endpoint)
.withMetrics(new EmptyS3AStatisticsContext()
.newStatisticsFromAwsSdk());
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/delegation/ITestSessionDelegationInFileystem.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/delegation/ITestSessionDelegationInFileystem.java
index 767848f65c7..47fad292156 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/delegation/ITestSessionDelegationInFileystem.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/delegation/ITestSessionDelegationInFileystem.java
@@ -590,7 +590,6 @@ public class ITestSessionDelegationInFileystem extends AbstractDelegationIT {
S3ClientFactory.S3ClientCreationParameters parameters = null;
parameters = new S3ClientFactory.S3ClientCreationParameters()
.withCredentialSet(testingCreds)
- .withPath(new URI("s3a://localhost/"))
.withEndpoint(DEFAULT_ENDPOINT)
.withMetrics(new EmptyS3AStatisticsContext()
.newStatisticsFromAwsSdk())
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org