fix: improve 503 handling for json resumable uploads (#2987)

benjaminp · sfc-gh-mwnukowski · web-flow · commit 9bc2b14a0058 · 2025-03-14T11:59:03.000-04:00
Port `NullPointerException` fix of `JsonResumableSessionPutTask` in 9b4bb82 to `JsonResumableSessionQueryTask`, which has similar code. --------- Co-authored-by: Michal Wnukowski <michal.wnukowski@snowflake.com>
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/JsonResumableSessionQueryTask.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/JsonResumableSessionQueryTask.java
@@ -113,14 +113,17 @@ final class JsonResumableSessionQueryTask
       } else {
         HttpResponseException cause = new HttpResponseException(response);
         String contentType = response.getHeaders().getContentType();
+        Long contentLength = response.getHeaders().getContentLength();
         // If the content-range header value has run ahead of the backend, it will respond with
         // a 503 with plain text content
         // Attempt to detect this very loosely as to minimize impact of modified error message
         // This is accurate circa 2023-06
         if ((!ResumableSessionFailureScenario.isOk(code)
                 && !ResumableSessionFailureScenario.isContinue(code))
             && contentType != null
-            && contentType.startsWith("text/plain")) {
+            && contentType.startsWith("text/plain")
+            && contentLength != null
+            && contentLength > 0) {
           String errorMessage = cause.getContent().toLowerCase(Locale.US);
           if (errorMessage.contains("content-range")) {
             throw ResumableSessionFailureScenario.SCENARIO_5.toStorageException(
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/ITJsonResumableSessionQueryTaskTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/ITJsonResumableSessionQueryTaskTest.java
@@ -237,4 +237,27 @@ public void query_badOffset() throws Exception {
       assertThat(se.getReason()).isEqualTo("dataLoss");
     }
   }
+
+  @Test
+  public void _503_emptyBody() throws Exception {
+    HttpRequestHandler handler =
+        req -> {
+          FullHttpResponse resp =
+              new DefaultFullHttpResponse(req.protocolVersion(), APPEND_GREATER_THAN_CURRENT_SIZE);
+          resp.headers().set(CONTENT_TYPE, "text/plain; charset=utf-8");
+          return resp;
+        };
+
+    try (FakeHttpServer fakeHttpServer = FakeHttpServer.of(handler)) {
+      URI endpoint = fakeHttpServer.getEndpoint();
+      String uploadUrl =
+          String.format(Locale.US, "%s/upload/%s", endpoint.toString(), UUID.randomUUID());
+
+      JsonResumableSessionQueryTask task =
+          new JsonResumableSessionQueryTask(httpClientContext, jsonResumableWrite(uploadUrl));
+
+      StorageException se = assertThrows(StorageException.class, task::call);
+      assertThat(se.getCode()).isEqualTo(503);
+    }
+  }
 }
