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 2017/03/21 13:19:17 UTC
[1/3] hadoop git commit: HADOOP-14204 S3A multipart commit failing,
"UnsupportedOperationException at
java.util.Collections$UnmodifiableList.sort".
Repository: hadoop
Updated Branches:
refs/heads/branch-2 2c5de0c60 -> b4481fef4
refs/heads/branch-2.8 e792f1671 -> 595501c9d
refs/heads/trunk 3b908f71c -> 2841666f1
HADOOP-14204 S3A multipart commit failing,
"UnsupportedOperationException at java.util.Collections$UnmodifiableList.sort".
Contributed by Steve Loughran
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/595501c9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/595501c9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/595501c9
Branch: refs/heads/branch-2.8
Commit: 595501c9ddacd5fdb740ac1bf9bfeb0ffbbd6c0e
Parents: e792f16
Author: Steve Loughran <st...@apache.org>
Authored: Tue Mar 21 13:13:16 2017 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Mar 21 13:13:16 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/595501c9/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 acd1da1..9367fc4 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
@@ -2295,11 +2295,13 @@ public class S3AFileSystem extends FileSystem {
"No partitions have been uploaded");
LOG.debug("Completing multipart upload {} with {} parts",
uploadId, partETags.size());
+ // a copy of the list is required, so that the AWS SDK doesn't
+ // attempt to sort an unmodifiable list.
return s3.completeMultipartUpload(
new CompleteMultipartUploadRequest(bucket,
key,
uploadId,
- partETags));
+ new ArrayList<>(partETags)));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/3] hadoop git commit: HADOOP-14204 S3A multipart commit failing,
"UnsupportedOperationException at
java.util.Collections$UnmodifiableList.sort".
Posted by st...@apache.org.
HADOOP-14204 S3A multipart commit failing,
"UnsupportedOperationException at java.util.Collections$UnmodifiableList.sort".
Contributed by Steve Loughran
(cherry picked from commit 595501c9ddacd5fdb740ac1bf9bfeb0ffbbd6c0e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b4481fef
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b4481fef
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b4481fef
Branch: refs/heads/branch-2
Commit: b4481fef41a815fb3e0d94a65fae48983a7e09b0
Parents: 2c5de0c
Author: Steve Loughran <st...@apache.org>
Authored: Tue Mar 21 13:14:43 2017 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Mar 21 13:14:43 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4481fef/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 209ead7..d4d97b7 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
@@ -2400,11 +2400,13 @@ public class S3AFileSystem extends FileSystem {
"No partitions have been uploaded");
LOG.debug("Completing multipart upload {} with {} parts",
uploadId, partETags.size());
+ // a copy of the list is required, so that the AWS SDK doesn't
+ // attempt to sort an unmodifiable list.
return s3.completeMultipartUpload(
new CompleteMultipartUploadRequest(bucket,
key,
uploadId,
- partETags));
+ new ArrayList<>(partETags)));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/3] hadoop git commit: HADOOP-14204 S3A multipart commit failing,
"UnsupportedOperationException at
java.util.Collections$UnmodifiableList.sort".
Posted by st...@apache.org.
HADOOP-14204 S3A multipart commit failing,
"UnsupportedOperationException at java.util.Collections$UnmodifiableList.sort".
Contributed by Steve Loughran
(cherry picked from commit 595501c9ddacd5fdb740ac1bf9bfeb0ffbbd6c0e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2841666f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2841666f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2841666f
Branch: refs/heads/trunk
Commit: 2841666f1f2dec96761a0aa34a69cbb20297aa14
Parents: 3b908f7
Author: Steve Loughran <st...@apache.org>
Authored: Tue Mar 21 13:15:15 2017 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Mar 21 13:15:15 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2841666f/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 e0ff5a8..6c89412 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
@@ -2403,11 +2403,13 @@ public class S3AFileSystem extends FileSystem {
"No partitions have been uploaded");
LOG.debug("Completing multipart upload {} with {} parts",
uploadId, partETags.size());
+ // a copy of the list is required, so that the AWS SDK doesn't
+ // attempt to sort an unmodifiable list.
return s3.completeMultipartUpload(
new CompleteMultipartUploadRequest(bucket,
key,
uploadId,
- partETags));
+ new ArrayList<>(partETags)));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org