From 2db4acbd2d06c1da77a5c649b7f5a638f896f440 Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Wed, 20 May 2026 15:06:40 +0000
Subject: [PATCH 01/12] feat(storage): Adding CumulativeHasher wrapper class
 for Full object checksum

---
 .../cloud/storage/CumulativeHasher.java       | 152 ++++++++++++++++++
 .../java/com/google/cloud/storage/Hasher.java |   5 +-
 2 files changed, 155 insertions(+), 2 deletions(-)
 create mode 100644 java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/CumulativeHasher.java

diff --git a/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/CumulativeHasher.java b/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/CumulativeHasher.java
new file mode 100644
index 000000000000..ad4b5a2360e5
--- /dev/null
+++ b/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/CumulativeHasher.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.storage;
+
+import com.google.api.gax.grpc.GrpcStatusCode;
+import com.google.cloud.storage.Crc32cValue.Crc32cLengthKnown;
+import com.google.protobuf.ByteString;
+import io.grpc.Status.Code;
+import com.google.storage.v2.Object;
+import java.nio.ByteBuffer;
+import java.util.OptionalLong;
+import java.util.function.Supplier;
+
+/**
+ * A wrapper around hasher that accumulates checksums and validates them at the
+ * end of the read if it was a full object read.
+ */
+final class CumulativeHasher implements Hasher {
+  private final Hasher delegate;
+  private final long startOffset;
+  private final OptionalLong limit;
+  private Crc32cLengthKnown cumulativeHash;
+
+  CumulativeHasher(Hasher delegate, long startOffset, OptionalLong limit) {
+    this.delegate = delegate;
+    this.startOffset = startOffset;
+    this.limit = limit;
+    this.cumulativeHash = Crc32cValue.zero();
+  }
+
+  @Override
+  public Crc32cLengthKnown hash(ByteBuffer b) {
+    return delegate.hash(b);
+  }
+
+  @Override
+  public Crc32cLengthKnown hash(ByteString byteString) {
+    return delegate.hash(byteString);
+  }
+
+  @Override
+  public void validate(Crc32cValue<?> expected, Supplier<ByteBuffer> b) throws ChecksumMismatchException {
+    ByteBuffer byteBuffer = b.get();
+    Crc32cLengthKnown actual = delegate.hash(byteBuffer);
+    if (actual != null) {
+      if (expected != null && !actual.eqValue(expected)) {
+        throw new ChecksumMismatchException(expected, actual);
+      }
+      accumulate(actual);
+    }
+  }
+
+  @Override
+  public void validate(Crc32cValue<?> expected, ByteString byteString) throws ChecksumMismatchException {
+    Crc32cLengthKnown actual = delegate.hash(byteString);
+    if (actual != null) {
+      if (expected != null && !actual.eqValue(expected)) {
+        throw new ChecksumMismatchException(expected, actual);
+      }
+      accumulate(actual);
+    }
+  }
+
+  @Override
+  public void validateUnchecked(Crc32cValue<?> expected, ByteString byteString)
+      throws UncheckedChecksumMismatchException {
+    Crc32cLengthKnown actual = delegate.hash(byteString);
+    if (actual != null) {
+      if (expected != null && !actual.eqValue(expected)) {
+        throw new UncheckedChecksumMismatchException(expected, actual);
+      }
+      accumulate(actual);
+    }
+  }
+
+  @Override
+  public <C extends Crc32cValue<?>> C nullSafeConcat(C r1, Crc32cLengthKnown r2) {
+    return delegate.nullSafeConcat(r1, r2);
+  }
+
+  @Override
+  public Crc32cLengthKnown initialValue() {
+    return delegate.initialValue();
+  }
+
+  // Checks if it was a full object read.
+  boolean qualifiesForVerification(Object metadata) {
+    return startOffset == 0
+        && metadata != null
+        && metadata.hasChecksums()
+        && metadata.getChecksums().hasCrc32C()
+        && (!limit.isPresent() || limit.getAsLong() >= metadata.getSize());
+  }
+
+  void validateCumulativeChecksum(Object metadata) throws UncheckedCumulativeChecksumMismatchException {
+    if (qualifiesForVerification(metadata)) {
+      Crc32cValue<?> expected = Crc32cValue.of(metadata.getChecksums().getCrc32C());
+      Crc32cLengthKnown actual = getCumulativeHash();
+      if (!actual.eqValue(expected)) {
+        throw new UncheckedCumulativeChecksumMismatchException(expected, actual);
+      }
+    }
+  }
+
+  private void accumulate(Crc32cLengthKnown actual) {
+    cumulativeHash = cumulativeHash.concat(actual);
+  }
+
+  Crc32cLengthKnown getCumulativeHash() {
+    return cumulativeHash;
+  }
+}
+
+class UncheckedCumulativeChecksumMismatchException extends com.google.api.gax.rpc.DataLossException {
+  private static final GrpcStatusCode STATUS_CODE = GrpcStatusCode.of(Code.DATA_LOSS);
+  private final Crc32cValue<?> expected;
+  private final Crc32cLengthKnown actual;
+
+  UncheckedCumulativeChecksumMismatchException(Crc32cValue<?> expected, Crc32cLengthKnown actual) {
+    super(
+        String.format(
+            "Mismatch cumulative checksum value. Expected %s actual %s",
+            expected.debugString(), actual.debugString()),
+        /* cause= */ null,
+        STATUS_CODE,
+        /* retryable= */ false);
+    this.expected = expected;
+    this.actual = actual;
+  }
+
+  Crc32cValue<?> getExpected() {
+    return expected;
+  }
+
+  Crc32cLengthKnown getActual() {
+    return actual;
+  }
+}
diff --git a/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/Hasher.java b/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/Hasher.java
index c1b506de2f7e..59f90fec0601 100644
--- a/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/Hasher.java
+++ b/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/Hasher.java
@@ -212,7 +212,7 @@ final class ChecksumMismatchException extends IOException {
     private final Crc32cValue<?> expected;
     private final Crc32cLengthKnown actual;
 
-    private ChecksumMismatchException(Crc32cValue<?> expected, Crc32cLengthKnown actual) {
+    ChecksumMismatchException(Crc32cValue<?> expected, Crc32cLengthKnown actual) {
       super(
           String.format(
               Locale.US,
@@ -237,7 +237,7 @@ final class UncheckedChecksumMismatchException extends DataLossException {
     private final Crc32cValue<?> expected;
     private final Crc32cLengthKnown actual;
 
-    private UncheckedChecksumMismatchException(Crc32cValue<?> expected, Crc32cLengthKnown actual) {
+    UncheckedChecksumMismatchException(Crc32cValue<?> expected, Crc32cLengthKnown actual) {
       super(
           String.format(
               "Mismatch checksum value. Expected %s actual %s",
@@ -258,3 +258,4 @@ Crc32cLengthKnown getActual() {
     }
   }
 }
+

From 351729c281b051401fa3e3d84531f0135c4d0ad3 Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Mon, 25 May 2026 14:53:36 +0000
Subject: [PATCH 02/12] Fixing lint and small updates

---
 .../cloud/storage/CumulativeHasher.java       | 23 ++++++++++++-------
 .../java/com/google/cloud/storage/Hasher.java |  1 -
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/CumulativeHasher.java b/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/CumulativeHasher.java
index ad4b5a2360e5..1614a3595a75 100644
--- a/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/CumulativeHasher.java
+++ b/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/CumulativeHasher.java
@@ -19,15 +19,16 @@
 import com.google.api.gax.grpc.GrpcStatusCode;
 import com.google.cloud.storage.Crc32cValue.Crc32cLengthKnown;
 import com.google.protobuf.ByteString;
-import io.grpc.Status.Code;
 import com.google.storage.v2.Object;
+import io.grpc.Status.Code;
 import java.nio.ByteBuffer;
+import java.util.Locale;
 import java.util.OptionalLong;
 import java.util.function.Supplier;
 
 /**
- * A wrapper around hasher that accumulates checksums and validates them at the
- * end of the read if it was a full object read.
+ * A wrapper around hasher that accumulates checksums and validates them at the end of the read if
+ * it was a full object read.
  */
 final class CumulativeHasher implements Hasher {
   private final Hasher delegate;
@@ -53,7 +54,8 @@ public Crc32cLengthKnown hash(ByteString byteString) {
   }
 
   @Override
-  public void validate(Crc32cValue<?> expected, Supplier<ByteBuffer> b) throws ChecksumMismatchException {
+  public void validate(Crc32cValue<?> expected, Supplier<ByteBuffer> b)
+      throws ChecksumMismatchException {
     ByteBuffer byteBuffer = b.get();
     Crc32cLengthKnown actual = delegate.hash(byteBuffer);
     if (actual != null) {
@@ -65,7 +67,8 @@ public void validate(Crc32cValue<?> expected, Supplier<ByteBuffer> b) throws Che
   }
 
   @Override
-  public void validate(Crc32cValue<?> expected, ByteString byteString) throws ChecksumMismatchException {
+  public void validate(Crc32cValue<?> expected, ByteString byteString)
+      throws ChecksumMismatchException {
     Crc32cLengthKnown actual = delegate.hash(byteString);
     if (actual != null) {
       if (expected != null && !actual.eqValue(expected)) {
@@ -106,7 +109,8 @@ boolean qualifiesForVerification(Object metadata) {
         && (!limit.isPresent() || limit.getAsLong() >= metadata.getSize());
   }
 
-  void validateCumulativeChecksum(Object metadata) throws UncheckedCumulativeChecksumMismatchException {
+  void validateCumulativeChecksum(Object metadata)
+      throws UncheckedCumulativeChecksumMismatchException {
     if (qualifiesForVerification(metadata)) {
       Crc32cValue<?> expected = Crc32cValue.of(metadata.getChecksums().getCrc32C());
       Crc32cLengthKnown actual = getCumulativeHash();
@@ -125,7 +129,8 @@ Crc32cLengthKnown getCumulativeHash() {
   }
 }
 
-class UncheckedCumulativeChecksumMismatchException extends com.google.api.gax.rpc.DataLossException {
+final class UncheckedCumulativeChecksumMismatchException
+    extends com.google.api.gax.rpc.DataLossException {
   private static final GrpcStatusCode STATUS_CODE = GrpcStatusCode.of(Code.DATA_LOSS);
   private final Crc32cValue<?> expected;
   private final Crc32cLengthKnown actual;
@@ -133,8 +138,10 @@ class UncheckedCumulativeChecksumMismatchException extends com.google.api.gax.rp
   UncheckedCumulativeChecksumMismatchException(Crc32cValue<?> expected, Crc32cLengthKnown actual) {
     super(
         String.format(
+            Locale.US,
             "Mismatch cumulative checksum value. Expected %s actual %s",
-            expected.debugString(), actual.debugString()),
+            expected.debugString(),
+            actual.debugString()),
         /* cause= */ null,
         STATUS_CODE,
         /* retryable= */ false);
diff --git a/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/Hasher.java b/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/Hasher.java
index 59f90fec0601..02dfe9efef41 100644
--- a/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/Hasher.java
+++ b/java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/Hasher.java
@@ -258,4 +258,3 @@ Crc32cLengthKnown getActual() {
     }
   }
 }
-

From 650d9731b481fc7fefc7745ee7f86def3de4f2dd Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Thu, 4 Jun 2026 13:14:11 +0000
Subject: [PATCH 03/12] disabling failing integration test

---
 .../google/cloud/storage/ITGzipReadableByteChannelTest.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java
index 2bf6f9ea47ae..a99e585723c9 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java
@@ -40,6 +40,7 @@
 import java.security.SecureRandom;
 import java.util.concurrent.ExecutionException;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
@@ -95,6 +96,7 @@ public class ITGzipReadableByteChannelTest {
           .setChecksummedData(getChecksummedData(contentCompressed2))
           .build();
 
+  @Ignore
   public static final class Uncompressed {
     private static final StorageGrpc.StorageImplBase fakeStorage =
         new StorageGrpc.StorageImplBase() {
@@ -171,6 +173,7 @@ public void autoGzipDecompress_false() throws IOException {
     }
   }
 
+  @Ignore
   public static final class Compressed {
 
     private static final StorageGrpc.StorageImplBase fakeStorage =

From f5a9e5012c6b36d3941b6b9162ed37a8703c8c13 Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Fri, 5 Jun 2026 05:43:58 +0000
Subject: [PATCH 04/12] Disabling GapicUnbufferedReadableByteChannelTest

---
 .../cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java
index 1e1c05915ab5..26429b2ffc2a 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java
@@ -50,8 +50,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.Ignore;
 import org.junit.Test;
 
+@Ignore
 public final class ITGapicUnbufferedReadableByteChannelTest {
   private final byte[] bytes = DataGenerator.base64Characters().genBytes(40);
   private final ByteString data1 = ByteString.copyFrom(bytes, 0, 10);

From e17d215c5d18af95cf25953c677f1d6fdb6a9e5c Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Fri, 5 Jun 2026 06:47:26 +0000
Subject: [PATCH 05/12] test(storage): mitigate testbench timeout and ignore
 flaky streaming tests

---
 .../storage/ITGapicUnbufferedReadableByteChannelTest.java  | 1 +
 .../cloud/storage/ITGzipReadableByteChannelTest.java       | 1 +
 .../google/cloud/storage/it/runner/registry/TestBench.java | 7 +++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java
index 26429b2ffc2a..a5de8bfd6297 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java
@@ -53,6 +53,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+// Permanently ignore streaming test to prevent CI/CD presubmit hanging
 @Ignore
 public final class ITGapicUnbufferedReadableByteChannelTest {
   private final byte[] bytes = DataGenerator.base64Characters().genBytes(40);
diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java
index a99e585723c9..f30bc8fa80bd 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java
@@ -319,6 +319,7 @@ public void storage_reader_returnRawInputStream_true() throws Exception {
     }
   }
 
+  @Ignore
   public static final class Behavior {
 
     @Test
diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
index 4d9340762093..699f09747694 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
@@ -219,6 +219,9 @@ public void start() {
       LOGGER.info("Redirecting server stdout to: {}", outFile.getAbsolutePath());
       LOGGER.info("Redirecting server stderr to: {}", errFile.getAbsolutePath());
       String dockerImage = String.format(Locale.US, "%s:%s", dockerImageName, dockerImageTag);
+      try {
+        new ProcessBuilder("docker", "rm", "-f", containerName).start().waitFor(5, TimeUnit.SECONDS);
+      } catch (Exception ignore) {}
       // First try and pull the docker image, this validates docker is available and running
       // on the host, as well as gives time for the image to be downloaded independently of
       // trying to start the container. (Below, when we first start the container we then attempt
@@ -282,7 +285,7 @@ public void start() {
             runWithRetries(
                 TestBench.this::listRetryTests,
                 RetrySettings.newBuilder()
-                    .setTotalTimeoutDuration(Duration.ofSeconds(30))
+                    .setTotalTimeoutDuration(Duration.ofSeconds(90))
                     .setInitialRetryDelayDuration(Duration.ofMillis(500))
                     .setRetryDelayMultiplier(1.5)
                     .setMaxRetryDelayDuration(Duration.ofSeconds(5))
@@ -496,7 +499,7 @@ static final class Builder {
 
     private Builder() {
       this(
-          false,
+          true,
           DEFAULT_BASE_URI,
           DEFAULT_GRPC_BASE_URI,
           DEFAULT_IMAGE_NAME,

From e7544817b59a8bf5a8d1f4bc4d2774f7506b807c Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Fri, 5 Jun 2026 07:13:26 +0000
Subject: [PATCH 06/12] test(storage): retry transient socket connections in
 testbench control plane

---
 .../storage/it/runner/registry/TestBench.java | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
index 699f09747694..d955d69c241e 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
@@ -50,6 +50,7 @@
 import java.io.InputStreamReader;
 import java.net.SocketException;
 import java.net.URI;
+import java.util.concurrent.Callable;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -150,7 +151,7 @@ public RetryTestResource createRetryTest(RetryTestResource retryTestResource) th
     HttpContent content =
         new ByteArrayContent("application/json", jsonString.getBytes(StandardCharsets.UTF_8));
     HttpRequest req = requestFactory.buildPostRequest(url, content);
-    HttpResponse resp = req.execute();
+    HttpResponse resp = execWithRetries(req::execute);
     RetryTestResource result = gson.fromJson(resp.parseAsString(), RetryTestResource.class);
     resp.disconnect();
     return result;
@@ -159,14 +160,14 @@ public RetryTestResource createRetryTest(RetryTestResource retryTestResource) th
   public void deleteRetryTest(RetryTestResource retryTestResource) throws IOException {
     GenericUrl url = new GenericUrl(baseUri + "/retry_test/" + retryTestResource.id);
     HttpRequest req = requestFactory.buildDeleteRequest(url);
-    HttpResponse resp = req.execute();
+    HttpResponse resp = execWithRetries(req::execute);
     resp.disconnect();
   }
 
   public RetryTestResource getRetryTest(RetryTestResource retryTestResource) throws IOException {
     GenericUrl url = new GenericUrl(baseUri + "/retry_test/" + retryTestResource.id);
     HttpRequest req = requestFactory.buildGetRequest(url);
-    HttpResponse resp = req.execute();
+    HttpResponse resp = execWithRetries(req::execute);
     RetryTestResource result = gson.fromJson(resp.parseAsString(), RetryTestResource.class);
     resp.disconnect();
     return result;
@@ -175,7 +176,7 @@ public RetryTestResource getRetryTest(RetryTestResource retryTestResource) throw
   public List<RetryTestResource> listRetryTests() throws IOException {
     GenericUrl url = new GenericUrl(baseUri + "/retry_tests");
     HttpRequest req = requestFactory.buildGetRequest(url);
-    HttpResponse resp = req.execute();
+    HttpResponse resp = execWithRetries(req::execute);
     JsonObject result = gson.fromJson(resp.parseAsString(), JsonObject.class);
     JsonArray retryTest = (JsonArray) result.get("retry_test");
     ImmutableList.Builder<RetryTestResource> b = ImmutableList.builder();
@@ -186,6 +187,33 @@ public List<RetryTestResource> listRetryTests() throws IOException {
     return b.build();
   }
 
+  private <T> T execWithRetries(Callable<T> callable) throws IOException {
+    try {
+      return runWithRetries(
+          callable,
+          RetrySettings.newBuilder()
+              .setTotalTimeoutDuration(Duration.ofSeconds(15))
+              .setInitialRetryDelayDuration(Duration.ofMillis(200))
+              .setRetryDelayMultiplier(1.5)
+              .setMaxRetryDelayDuration(Duration.ofSeconds(2))
+              .setMaxAttempts(5)
+              .build(),
+          new BasicResultRetryAlgorithm<T>() {
+            @Override
+            public boolean shouldRetry(Throwable previousThrowable, T previousResponse) {
+              return previousThrowable instanceof SocketException
+                  || previousThrowable instanceof IOException;
+            }
+          },
+          NanoClock.getDefaultClock());
+    } catch (RetryHelperException e) {
+      if (e.getCause() instanceof IOException) {
+        throw (IOException) e.getCause();
+      }
+      throw new IOException(e);
+    }
+  }
+
   private boolean startGRPCServer(int gRPCPort) throws IOException {
     GenericUrl url = new GenericUrl(baseUri + "/start_grpc?port=9090");
     HttpRequest req = requestFactory.buildGetRequest(url);

From c02746a14b10058b477d3acc8f4e8e14bafc99ca Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Fri, 5 Jun 2026 07:37:43 +0000
Subject: [PATCH 07/12] Adding more debugging

---
 .../cloud/storage/it/runner/registry/TestBench.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
index d955d69c241e..0c95a0ca2380 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
@@ -294,8 +294,8 @@ public void start() {
               "gunicorn",
               "--bind=0.0.0.0:9000",
               "--worker-class=sync",
-              "--threads=10",
-              "--access-logfile=-",
+              "--threads=15",
+                  "--access-logfile=-",
               "--keep-alive=0",
               "testbench:run()");
       process =
@@ -361,8 +361,14 @@ public void stop() {
         int processExitValue = process.exitValue();
         if (processExitValue != 0) {
           attemptForceStopContainer = true;
+          LOGGER.warn("Container exit value = {}", processExitValue);
+          try {
+            dumpServerLogs(outPath, errPath);
+          } catch (Exception ignore) {
+          }
+        } else {
+          LOGGER.warn("Container exit value = {}", processExitValue);
         }
-        LOGGER.warn("Container exit value = {}", processExitValue);
       } catch (IllegalThreadStateException e) {
         attemptForceStopContainer = true;
       }

From ca67ea00e058be2d114e7b8d4b559b1001b9026b Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Fri, 5 Jun 2026 09:46:37 +0000
Subject: [PATCH 08/12] fix(testbench): remove 15s retry wrapper on REST
 control plane calls to stop 5h CI hang

---
 .../storage/it/runner/registry/TestBench.java | 34 +++----------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
index 0c95a0ca2380..152fb190ab84 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
@@ -151,7 +151,7 @@ public RetryTestResource createRetryTest(RetryTestResource retryTestResource) th
     HttpContent content =
         new ByteArrayContent("application/json", jsonString.getBytes(StandardCharsets.UTF_8));
     HttpRequest req = requestFactory.buildPostRequest(url, content);
-    HttpResponse resp = execWithRetries(req::execute);
+    HttpResponse resp = req.execute();
     RetryTestResource result = gson.fromJson(resp.parseAsString(), RetryTestResource.class);
     resp.disconnect();
     return result;
@@ -160,14 +160,14 @@ public RetryTestResource createRetryTest(RetryTestResource retryTestResource) th
   public void deleteRetryTest(RetryTestResource retryTestResource) throws IOException {
     GenericUrl url = new GenericUrl(baseUri + "/retry_test/" + retryTestResource.id);
     HttpRequest req = requestFactory.buildDeleteRequest(url);
-    HttpResponse resp = execWithRetries(req::execute);
+    HttpResponse resp = req.execute();
     resp.disconnect();
   }
 
   public RetryTestResource getRetryTest(RetryTestResource retryTestResource) throws IOException {
     GenericUrl url = new GenericUrl(baseUri + "/retry_test/" + retryTestResource.id);
     HttpRequest req = requestFactory.buildGetRequest(url);
-    HttpResponse resp = execWithRetries(req::execute);
+    HttpResponse resp = req.execute();
     RetryTestResource result = gson.fromJson(resp.parseAsString(), RetryTestResource.class);
     resp.disconnect();
     return result;
@@ -176,7 +176,7 @@ public RetryTestResource getRetryTest(RetryTestResource retryTestResource) throw
   public List<RetryTestResource> listRetryTests() throws IOException {
     GenericUrl url = new GenericUrl(baseUri + "/retry_tests");
     HttpRequest req = requestFactory.buildGetRequest(url);
-    HttpResponse resp = execWithRetries(req::execute);
+    HttpResponse resp = req.execute();
     JsonObject result = gson.fromJson(resp.parseAsString(), JsonObject.class);
     JsonArray retryTest = (JsonArray) result.get("retry_test");
     ImmutableList.Builder<RetryTestResource> b = ImmutableList.builder();
@@ -187,32 +187,6 @@ public List<RetryTestResource> listRetryTests() throws IOException {
     return b.build();
   }
 
-  private <T> T execWithRetries(Callable<T> callable) throws IOException {
-    try {
-      return runWithRetries(
-          callable,
-          RetrySettings.newBuilder()
-              .setTotalTimeoutDuration(Duration.ofSeconds(15))
-              .setInitialRetryDelayDuration(Duration.ofMillis(200))
-              .setRetryDelayMultiplier(1.5)
-              .setMaxRetryDelayDuration(Duration.ofSeconds(2))
-              .setMaxAttempts(5)
-              .build(),
-          new BasicResultRetryAlgorithm<T>() {
-            @Override
-            public boolean shouldRetry(Throwable previousThrowable, T previousResponse) {
-              return previousThrowable instanceof SocketException
-                  || previousThrowable instanceof IOException;
-            }
-          },
-          NanoClock.getDefaultClock());
-    } catch (RetryHelperException e) {
-      if (e.getCause() instanceof IOException) {
-        throw (IOException) e.getCause();
-      }
-      throw new IOException(e);
-    }
-  }
 
   private boolean startGRPCServer(int gRPCPort) throws IOException {
     GenericUrl url = new GenericUrl(baseUri + "/start_grpc?port=9090");

From 98f257622d9eb979d523b6ecaaebab8f20435648 Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Fri, 5 Jun 2026 11:04:51 +0000
Subject: [PATCH 09/12] test(storage): isolate concurrent Surefire/Failsafe
 test forks to dedicated emulator containers and ports using
 surefire.forkNumber

---
 .../storage/it/runner/registry/TestBench.java | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
index 152fb190ab84..ffbd9d630512 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
@@ -498,6 +498,41 @@ static final class Builder {
 
     private static final String DEFAULT_CONTAINER_NAME = "default";
 
+    private static int getForkNumber() {
+      String forkStr = System.getProperty("surefire.forkNumber");
+      if (forkStr != null) {
+        try {
+          return Integer.parseInt(forkStr.trim());
+        } catch (NumberFormatException ignore) {
+        }
+      }
+      return 0;
+    }
+
+    private static String getDefaultBaseUri() {
+      int fork = getForkNumber();
+      if (fork > 1) {
+        return "http://localhost:" + (9000 + (fork - 1) * 10);
+      }
+      return DEFAULT_BASE_URI;
+    }
+
+    private static String getDefaultGrpcBaseUri() {
+      int fork = getForkNumber();
+      if (fork > 1) {
+        return "http://localhost:" + (9005 + (fork - 1) * 10);
+      }
+      return DEFAULT_GRPC_BASE_URI;
+    }
+
+    private static String getDefaultContainerName() {
+      int fork = getForkNumber();
+      if (fork > 1) {
+        return DEFAULT_CONTAINER_NAME + "_" + fork;
+      }
+      return DEFAULT_CONTAINER_NAME;
+    }
+
     private boolean ignorePullError;
     private String baseUri;
     private String gRPCBaseUri;
@@ -508,11 +543,11 @@ static final class Builder {
     private Builder() {
       this(
           true,
-          DEFAULT_BASE_URI,
-          DEFAULT_GRPC_BASE_URI,
+          getDefaultBaseUri(),
+          getDefaultGrpcBaseUri(),
           DEFAULT_IMAGE_NAME,
           DEFAULT_IMAGE_TAG,
-          DEFAULT_CONTAINER_NAME);
+          getDefaultContainerName());
     }
 
     private Builder(

From 317e412d65d55da1a52bee9863c5d042af09d9b3 Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Mon, 8 Jun 2026 07:25:33 +0000
Subject: [PATCH 10/12] adding failsafe-config

---
 java-storage/google-cloud-storage/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/java-storage/google-cloud-storage/pom.xml b/java-storage/google-cloud-storage/pom.xml
index 64c0aa4be522..18cd15e86900 100644
--- a/java-storage/google-cloud-storage/pom.xml
+++ b/java-storage/google-cloud-storage/pom.xml
@@ -460,6 +460,15 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <surefire.forkNumber>${surefire.forkNumber}</surefire.forkNumber>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

From c9b0571e1920a70fabfe3d1c8f61d23cf9bc2b70 Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Mon, 8 Jun 2026 08:20:54 +0000
Subject: [PATCH 11/12] testing

---
 java-storage/google-cloud-storage/pom.xml     |  9 --------
 .../storage/it/runner/registry/TestBench.java | 22 +++++++++++++++++--
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/java-storage/google-cloud-storage/pom.xml b/java-storage/google-cloud-storage/pom.xml
index 18cd15e86900..64c0aa4be522 100644
--- a/java-storage/google-cloud-storage/pom.xml
+++ b/java-storage/google-cloud-storage/pom.xml
@@ -460,15 +460,6 @@
           </dependency>
         </dependencies>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <surefire.forkNumber>${surefire.forkNumber}</surefire.forkNumber>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
index ffbd9d630512..c2bd0428f40d 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java
@@ -509,7 +509,20 @@ private static int getForkNumber() {
       return 0;
     }
 
+    private static int findFreePort() {
+      try (java.net.ServerSocket socket = new java.net.ServerSocket(0)) {
+        socket.setReuseAddress(true);
+        return socket.getLocalPort();
+      } catch (IOException e) {
+        return 0;
+      }
+    }
+
     private static String getDefaultBaseUri() {
+      int port = findFreePort();
+      if (port > 0) {
+        return "http://localhost:" + port;
+      }
       int fork = getForkNumber();
       if (fork > 1) {
         return "http://localhost:" + (9000 + (fork - 1) * 10);
@@ -518,6 +531,10 @@ private static String getDefaultBaseUri() {
     }
 
     private static String getDefaultGrpcBaseUri() {
+      int port = findFreePort();
+      if (port > 0) {
+        return "http://localhost:" + port;
+      }
       int fork = getForkNumber();
       if (fork > 1) {
         return "http://localhost:" + (9005 + (fork - 1) * 10);
@@ -527,10 +544,11 @@ private static String getDefaultGrpcBaseUri() {
 
     private static String getDefaultContainerName() {
       int fork = getForkNumber();
+      String suffix = java.util.UUID.randomUUID().toString().substring(0, 8);
       if (fork > 1) {
-        return DEFAULT_CONTAINER_NAME + "_" + fork;
+        return DEFAULT_CONTAINER_NAME + "_" + fork + "_" + suffix;
       }
-      return DEFAULT_CONTAINER_NAME;
+      return DEFAULT_CONTAINER_NAME + "_" + suffix;
     }
 
     private boolean ignorePullError;

From 1da4ba74d3231302fd0411c15011b9103de6b3b4 Mon Sep 17 00:00:00 2001
From: Dhriti Chopra <dhritichopra@google.com>
Date: Mon, 8 Jun 2026 08:55:01 +0000
Subject: [PATCH 12/12] Undo ignored tests

---
 .../src/test/java/com/google/cloud/storage/FakeServer.java     | 2 +-
 .../storage/ITGapicUnbufferedReadableByteChannelTest.java      | 2 --
 .../google/cloud/storage/ITGzipReadableByteChannelTest.java    | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/FakeServer.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/FakeServer.java
index 0481f2b062e6..033aeaa67e53 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/FakeServer.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/FakeServer.java
@@ -54,7 +54,7 @@ public void close() throws InterruptedException {
   }
 
   static FakeServer of(StorageGrpc.StorageImplBase service) throws IOException {
-    InetSocketAddress address = new InetSocketAddress("localhost", 0);
+    InetSocketAddress address = new InetSocketAddress("127.0.0.1", 0);
     Server server = NettyServerBuilder.forAddress(address).addService(service).build();
     server.start();
     String endpoint = String.format(Locale.US, "%s:%d", address.getHostString(), server.getPort());
diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java
index a5de8bfd6297..12d8694e4350 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedReadableByteChannelTest.java
@@ -53,8 +53,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-// Permanently ignore streaming test to prevent CI/CD presubmit hanging
-@Ignore
 public final class ITGapicUnbufferedReadableByteChannelTest {
   private final byte[] bytes = DataGenerator.base64Characters().genBytes(40);
   private final ByteString data1 = ByteString.copyFrom(bytes, 0, 10);
diff --git a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java
index f30bc8fa80bd..b292b13c141b 100644
--- a/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java
+++ b/java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/ITGzipReadableByteChannelTest.java
@@ -96,7 +96,6 @@ public class ITGzipReadableByteChannelTest {
           .setChecksummedData(getChecksummedData(contentCompressed2))
           .build();
 
-  @Ignore
   public static final class Uncompressed {
     private static final StorageGrpc.StorageImplBase fakeStorage =
         new StorageGrpc.StorageImplBase() {
@@ -173,7 +172,6 @@ public void autoGzipDecompress_false() throws IOException {
     }
   }
 
-  @Ignore
   public static final class Compressed {
 
     private static final StorageGrpc.StorageImplBase fakeStorage =
@@ -319,7 +317,6 @@ public void storage_reader_returnRawInputStream_true() throws Exception {
     }
   }
 
-  @Ignore
   public static final class Behavior {
 
     @Test