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 as...@apache.org on 2016/04/22 20:59:04 UTC
[41/50] [abbrv] hadoop git commit: HADOOP-12891. S3AFileSystem should
configure Multipart Copy threshold and chunk size. (Andrew Olson via stevel)
HADOOP-12891. S3AFileSystem should configure Multipart Copy threshold and chunk size. (Andrew Olson via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/19f0f960
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/19f0f960
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/19f0f960
Branch: refs/heads/yarn-2877
Commit: 19f0f9608e31203523943f008ac701b6f3d7973c
Parents: 337bcde
Author: Steve Loughran <st...@apache.org>
Authored: Fri Apr 22 11:24:24 2016 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Apr 22 11:25:03 2016 +0100
----------------------------------------------------------------------
.../hadoop-common/src/main/resources/core-default.xml | 5 ++++-
.../src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 2 ++
.../hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md | 4 +++-
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/19f0f960/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index ac8bc5a..b4f11e7 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -867,7 +867,10 @@
<property>
<name>fs.s3a.multipart.threshold</name>
<value>2147483647</value>
- <description>Threshold before uploads or copies use parallel multipart operations.</description>
+ <description>How big (in bytes) to split upload or copy operations up into.
+ This also controls the partition size in renamed files, as rename() involves
+ copying the source file(s)
+ </description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/19f0f960/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java
----------------------------------------------------------------------
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 97092ac..8739798 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
@@ -260,6 +260,8 @@ public class S3AFileSystem extends FileSystem {
TransferManagerConfiguration transferConfiguration = new TransferManagerConfiguration();
transferConfiguration.setMinimumUploadPartSize(partSize);
transferConfiguration.setMultipartUploadThreshold(multiPartThreshold);
+ transferConfiguration.setMultipartCopyPartSize(partSize);
+ transferConfiguration.setMultipartCopyThreshold(multiPartThreshold);
transfers = new TransferManager(s3, threadPoolExecutor);
transfers.setConfiguration(transferConfiguration);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/19f0f960/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
index e87b884..2dae7d7 100644
--- a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
+++ b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
@@ -312,7 +312,9 @@ this capability.
<property>
<name>fs.s3a.multipart.size</name>
<value>104857600</value>
- <description>How big (in bytes) to split upload or copy operations up into.</description>
+ <description>How big (in bytes) to split upload or copy operations up into.
+ This also controls the partition size in renamed files, as rename() involves
+ copying the source file(s)</description>
</property>
<property>