49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
|
|
index 3486dfb..ad19d00 100644
|
|
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
|
|
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
|
|
@@ -35,6 +35,7 @@
|
|
|
|
//use a custom endpoint?
|
|
public static final String ENDPOINT = "fs.s3a.endpoint";
|
|
+ public static final String PATH_STYLE_ACCESS = "fs.s3a.path.style.access";
|
|
//connect to s3 through a proxy server?
|
|
public static final String PROXY_HOST = "fs.s3a.proxy.host";
|
|
public static final String PROXY_PORT = "fs.s3a.proxy.port";
|
|
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 91a606c..17b272a 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
|
|
@@ -40,6 +40,7 @@
|
|
|
|
import com.amazonaws.auth.InstanceProfileCredentialsProvider;
|
|
import com.amazonaws.services.s3.AmazonS3Client;
|
|
+import com.amazonaws.services.s3.S3ClientOptions;
|
|
import com.amazonaws.services.s3.model.CannedAccessControlList;
|
|
import com.amazonaws.services.s3.model.DeleteObjectsRequest;
|
|
import com.amazonaws.services.s3.model.ListObjectsRequest;
|
|
@@ -244,6 +245,8 @@ public void initialize(URI name, Configuration conf) throws IOException {
|
|
}
|
|
}
|
|
|
|
+ enablePathStyleAccessIfRequired(conf);
|
|
+
|
|
maxKeys = conf.getInt(MAX_PAGING_KEYS, DEFAULT_MAX_PAGING_KEYS);
|
|
partSize = conf.getLong(MULTIPART_SIZE, DEFAULT_MULTIPART_SIZE);
|
|
multiPartThreshold = conf.getInt(MIN_MULTIPART_THRESHOLD,
|
|
@@ -314,6 +317,14 @@ public void initialize(URI name, Configuration conf) throws IOException {
|
|
setConf(conf);
|
|
}
|
|
|
|
+ private void enablePathStyleAccessIfRequired(Configuration conf) {
|
|
+ final boolean pathStyleAccess = conf.getBoolean(PATH_STYLE_ACCESS, false);
|
|
+ if (pathStyleAccess) {
|
|
+ LOG.debug("Enabling path style access!");
|
|
+ s3.setS3ClientOptions(new S3ClientOptions().withPathStyleAccess(true));
|
|
+ }
|
|
+ }
|
|
+
|
|
/**
|
|
* Return the protocol scheme for the FileSystem.
|
|
*
|