Fixed an issue that could result in uncompletable future when headObj…

…ect request threw exception in copy (#3609)
aws · Dec 12, 2022 · 3e64224 · 3e64224
1 parent b257950
commit 3e64224
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/...es/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/CopyObjectHelper.java b/...es/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/CopyObjectHelper.java
@@ -67,19 +67,23 @@ public CompletableFuture<CopyObjectResponse> copyObject(CopyObjectRequest copyOb
 
         CompletableFuture<CopyObjectResponse> returnFuture = new CompletableFuture<>();
 
-        CompletableFuture<HeadObjectResponse> headFuture =
-            s3AsyncClient.headObject(CopyRequestConversionUtils.toHeadObjectRequest(copyObjectRequest));
-
-        // Ensure cancellations are forwarded to the head future
-        CompletableFutureUtils.forwardExceptionTo(returnFuture, headFuture);
-
-        headFuture.whenComplete((headObjectResponse, throwable) -> {
-            if (throwable != null) {
-                handleException(returnFuture, () -> "Failed to retrieve metadata from the source object", throwable);
-            } else {
-                doCopyObject(copyObjectRequest, returnFuture, headObjectResponse);
-            }
-        });
+        try {
+            CompletableFuture<HeadObjectResponse> headFuture =
+                s3AsyncClient.headObject(CopyRequestConversionUtils.toHeadObjectRequest(copyObjectRequest));
+
+            // Ensure cancellations are forwarded to the head future
+            CompletableFutureUtils.forwardExceptionTo(returnFuture, headFuture);
+
+            headFuture.whenComplete((headObjectResponse, throwable) -> {
+                if (throwable != null) {
+                    handleException(returnFuture, () -> "Failed to retrieve metadata from the source object", throwable);
+                } else {
+                    doCopyObject(copyObjectRequest, returnFuture, headObjectResponse);
+                }
+            });
+        } catch (Throwable throwable) {
+            returnFuture.completeExceptionally(throwable);
+        }
 
         return returnFuture;
     }

diff --git a/...3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/CopyObjectHelperTest.java b/...3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/CopyObjectHelperTest.java
@@ -86,6 +86,19 @@ void copyObject_HeadObjectRequestFailed_shouldFail() {
                                         .hasRootCause(exception);
     }
 
+    @Test
+    void copyObject_HeadObjectRequestThrowsException_shouldFail() {
+        RuntimeException exception = new RuntimeException("oops");
+
+        when(s3AsyncClient.headObject(any(HeadObjectRequest.class)))
+            .thenThrow(exception);
+
+        CompletableFuture<CopyObjectResponse> future =
+            copyHelper.copyObject(copyObjectRequest());
+
+        assertThatThrownBy(future::join).hasCause(exception);
+    }
+
     @Test
     void singlePartCopy_happyCase_shouldSucceed() {