Repository: hadoop Updated Branches: refs/heads/branch-2 9361fc8f7 -> af7368cf0 refs/heads/trunk 6f10434a5 -> 17165d3df
HADOOP-11520. Clean incomplete multi-part uploads in S3A tests. (Thomas Demoor via stevel) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/af7368cf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/af7368cf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/af7368cf Branch: refs/heads/branch-2 Commit: af7368cf032b445ff21c0b9dbb6605b28e4ca27c Parents: 9361fc8 Author: Steve Loughran <[email protected]> Authored: Fri Feb 6 20:59:56 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Feb 6 20:59:56 2015 +0000 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/af7368cf/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 925115d..8d1047f 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -178,6 +178,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11463 Replace method-local TransferManager object with S3AFileSystem#transfers. (Ted Yu via stevel) + HADOOP-11520. Clean incomplete multi-part uploads in S3A tests. + (Thomas Demoor via stevel) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. http://git-wip-us.apache.org/repos/asf/hadoop/blob/af7368cf/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java index 514647c..d9726db 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java @@ -45,6 +45,9 @@ public class S3ATestUtils { "No test filesystem in " + TestS3AFileSystemContract.TEST_FS_S3A_NAME); } S3AFileSystem fs1 = new S3AFileSystem(); + //enable purging in tests + conf.setBoolean(Constants.PURGE_EXISTING_MULTIPART, true); + conf.setInt(Constants.PURGE_EXISTING_MULTIPART_AGE, 0); fs1.initialize(testURI, conf); return fs1; }
