Repository: hadoop Updated Branches: refs/heads/trunk f90c64e62 -> d59ca43bf
HADOOP-15826. @Retries annotation of putObject() call & uses wrong. Contributed by Steve Loughran and Ewan Higgs. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d59ca43b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d59ca43b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d59ca43b Branch: refs/heads/trunk Commit: d59ca43bff8a457ce7ab62a61acd89aacbe71b93 Parents: f90c64e Author: Steve Loughran <ste...@apache.org> Authored: Tue Oct 16 20:02:54 2018 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Oct 16 20:02:54 2018 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 5 ++++- .../java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d59ca43b/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 df0ec5d..3c432fc 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 @@ -2449,11 +2449,14 @@ public class S3AFileSystem extends FileSystem implements StreamCapabilities { * Wait for an upload to complete. * If the waiting for completion is interrupted, the upload will be * aborted before an {@code InterruptedIOException} is thrown. - * @param upload upload to wait for + * If the upload (or its result collection) failed, this is where + * the failure is raised as an AWS exception * @param key destination key + * @param uploadInfo upload to wait for * @return the upload result * @throws InterruptedIOException if the blocking was interrupted. */ + @Retries.OnceRaw UploadResult waitForUploadCompletion(String key, UploadInfo uploadInfo) throws InterruptedIOException { Upload upload = uploadInfo.getUpload(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/d59ca43b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java index a85a87f..a5f6817 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java @@ -436,7 +436,7 @@ public class WriteOperationHelper { * @return the result of the operation * @throws IOException on problems */ - @Retries.OnceTranslated + @Retries.RetryTranslated public UploadResult uploadObject(PutObjectRequest putObjectRequest) throws IOException { // no retry; rely on xfer manager logic @@ -451,7 +451,7 @@ public class WriteOperationHelper { * @throws IOException on problems * @param destKey destination key */ - @Retries.RetryTranslated + @Retries.OnceTranslated public void revertCommit(String destKey) throws IOException { once("revert commit", destKey, () -> { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
