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 c9a3d51f715..904c1143b00 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 @@ -1353,7 +1353,7 @@ fs.s3a.multipart.size - 100M + 64M How big (in bytes) to split upload or copy operations up into. A suffix from the set {K,M,G,T,P} may be used to scale the numeric value. @@ -1361,7 +1361,7 @@ fs.s3a.multipart.threshold - 2147483647 + 128M 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). 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 e649a980b24..1135d95d04b 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 @@ -202,12 +202,12 @@ public final class Constants { // size of each of or multipart pieces in bytes public static final String MULTIPART_SIZE = "fs.s3a.multipart.size"; - public static final long DEFAULT_MULTIPART_SIZE = 104857600; // 100 MB + public static final long DEFAULT_MULTIPART_SIZE = 67108864; // 64M // minimum size in bytes before we start a multipart uploads or copy public static final String MIN_MULTIPART_THRESHOLD = "fs.s3a.multipart.threshold"; - public static final long DEFAULT_MIN_MULTIPART_THRESHOLD = Integer.MAX_VALUE; + public static final long DEFAULT_MIN_MULTIPART_THRESHOLD = 134217728; // 128M //enable multiobject-delete calls? public static final String ENABLE_MULTI_DELETE = 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 17414719ae8..94e6e006c7f 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 @@ -860,7 +860,7 @@ options are covered in [Testing](./testing.md). fs.s3a.multipart.size - 100M + 64M How big (in bytes) to split upload or copy operations up into. A suffix from the set {K,M,G,T,P} may be used to scale the numeric value. @@ -868,7 +868,7 @@ options are covered in [Testing](./testing.md). fs.s3a.multipart.threshold - 2147483647 + 128MB 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).