Skip to content

feat(storage): Parameterized test setup for RCU Integration Testing #14119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nidhiii-27 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat(storage): Parameterized test setup for RCU Integration Testing #14119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4cbede
feat(storage): Parameterized test setup for RCU Integration Testing
nidhiii-27 Aug 19, 2026
5dc69d5
add integration test files
nidhiii-27 Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions ...ge/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,26 @@ public HttpStorageRpc(StorageOptions options, JsonFactory jsonFactory) {
initializer = censusHttpModule.getHttpRequestInitializer(initializer);
initializer = new InvocationIdInitializer(initializer, applicationName, tm);
batchRequestInitializer = censusHttpModule.getHttpRequestInitializer(null);
storage =
String host = options.getHost();
Storage.Builder storageBuilder =
new Storage.Builder(transport, jsonFactory, initializer)
.setRootUrl(options.getHost())
.setApplicationName(applicationName)
.build();
.setApplicationName(applicationName);
if (host != null) {
java.net.URI uri = java.net.URI.create(host);
String path = uri.getPath();
if (path != null && !path.isEmpty() && !"/".equals(path)) {
String rootUrl = host.substring(0, host.indexOf(path));

@gemini-code-assist gemini-code-assist Bot Aug 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Using host.indexOf(path) to find the start of the path is generally safe here, but using host.length() - path.length() is more robust, direct, and avoids searching the string, as the path is guaranteed to be at the end of the host URL.

Suggested change
String rootUrl = host.substring(0, host.indexOf(path));
String rootUrl = host.substring(0, host.length() - path.length());

String servicePath = path.startsWith("/") ? path.substring(1) : path;
if (!servicePath.endsWith("/")) {
servicePath += "/";
}
storageBuilder.setRootUrl(rootUrl);
storageBuilder.setServicePath(servicePath);
} else {
storageBuilder.setRootUrl(host);
}
}
storage = storageBuilder.build();
}

public Storage getStorage() {
Expand Down
204 changes: 203 additions & 1 deletion ...gle-cloud-storage/src/test/java/com/google/cloud/storage/ITObjectReadSessionFakeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,16 @@ public void bidiReadObjectRedirectedError() throws Exception {
req3,
respond -> respond.onNext(res2)));

GrpcRequestAuditing requestAuditing = new GrpcRequestAuditing();
try (FakeServer fakeServer = FakeServer.of(fake);
Storage storage = fakeServer.getGrpcStorageOptions().toBuilder().build().getService()) {
Storage storage =
fakeServer.getGrpcStorageOptions().toBuilder()
.setGrpcInterceptorProvider(
() ->
ImmutableList.of(
requestAuditing, GrpcPlainRequestLoggingInterceptor.getInstance()))
.build()
.getService()) {

BlobId id = BlobId.of("b", "o");
ApiFuture<BlobReadSession> futureBlobDescriptor = storage.blobReadSession(id);
Expand All @@ -222,6 +230,12 @@ public void bidiReadObjectRedirectedError() throws Exception {
.get(1, TimeUnit.SECONDS);

assertThat(xxd(actual)).isEqualTo(xxd(content.getBytes()));

requestAuditing
.assertRequestHeader("x-goog-request-params")
.containsExactly(
"bucket=projects/_/buckets/b",
"bucket=projects/_/buckets/b&routing_token=" + routingToken);
}
}
}
Expand Down Expand Up @@ -1805,6 +1819,193 @@ static ObjectReadSessionImpl getObjectReadSessionImpl(BlobReadSession bd) {
return orsi;
}

private static Consumer<StreamObserver<BidiReadObjectResponse>> onRedirect(
BidiReadHandle handle, String token) {
return respond -> {
BidiReadObjectRedirectedError redirect =
BidiReadObjectRedirectedError.newBuilder()
.setReadHandle(handle)
.setRoutingToken(token)
.build();

com.google.rpc.Status grpcStatusDetails =
com.google.rpc.Status.newBuilder()
.setCode(com.google.rpc.Code.UNAVAILABLE_VALUE)
.setMessage("redirect")
.addDetails(Any.pack(redirect))
.build();

Metadata trailers = new Metadata();
trailers.put(GRPC_STATUS_DETAILS_KEY, grpcStatusDetails);
StatusRuntimeException statusRuntimeException =
Status.UNAVAILABLE.withDescription("redirect").asRuntimeException(trailers);
respond.onError(statusRuntimeException);
};
}

@Test
public void bidiReadObjectRedirectedError_redirectCounterResetOnResponse() throws Exception {
BidiReadHandle handle1 = BidiReadHandle.newBuilder().setHandle(ByteString.copyFromUtf8("handle-1")).build();
BidiReadHandle handle2 = BidiReadHandle.newBuilder().setHandle(ByteString.copyFromUtf8("handle-2")).build();
BidiReadHandle handle3 = BidiReadHandle.newBuilder().setHandle(ByteString.copyFromUtf8("handle-3")).build();
BidiReadHandle handle4 = BidiReadHandle.newBuilder().setHandle(ByteString.copyFromUtf8("handle-4")).build();
BidiReadHandle handle5 = BidiReadHandle.newBuilder().setHandle(ByteString.copyFromUtf8("handle-5")).build();

BidiReadObjectRequest req_read_1 = read(1, 10, 5);

BidiReadObjectRequest req_read_1_redirected_1 =
BidiReadObjectRequest.newBuilder()
.setReadObjectSpec(
BidiReadObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(1)
.setReadHandle(handle1)
.setRoutingToken("token-1")
.build())
.addReadRanges(getReadRange(1, 10, 5))
.build();

BidiReadObjectRequest req_read_2 =
BidiReadObjectRequest.newBuilder()
.addReadRanges(getReadRange(2, 15, 5))
.build();

BidiReadObjectRequest req_read_2_redirected_2 =
BidiReadObjectRequest.newBuilder()
.setReadObjectSpec(
BidiReadObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(1)
.setReadHandle(handle2)
.setRoutingToken("token-2")
.build())
.addReadRanges(getReadRange(2, 15, 5))
.build();

BidiReadObjectRequest req_read_3 =
BidiReadObjectRequest.newBuilder()
.addReadRanges(getReadRange(3, 20, 5))
.build();

BidiReadObjectRequest req_read_3_redirected_3 =
BidiReadObjectRequest.newBuilder()
.setReadObjectSpec(
BidiReadObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(1)
.setReadHandle(handle3)
.setRoutingToken("token-3")
.build())
.addReadRanges(getReadRange(3, 20, 5))
.build();

BidiReadObjectRequest req_read_3_redirected_4 =
BidiReadObjectRequest.newBuilder()
.setReadObjectSpec(
BidiReadObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(1)
.setReadHandle(handle4)
.setRoutingToken("token-4")
.build())
.addReadRanges(getReadRange(3, 20, 5))
.build();

BidiReadObjectRequest req_read_3_redirected_5 =
BidiReadObjectRequest.newBuilder()
.setReadObjectSpec(
BidiReadObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(1)
.setReadHandle(handle5)
.setRoutingToken("token-5")
.build())
.addReadRanges(getReadRange(3, 20, 5))
.build();

ChecksummedTestContent content1 = ChecksummedTestContent.of(ALL_OBJECT_BYTES, 10, 5);
BidiReadObjectResponse res_read_1 =
BidiReadObjectResponse.newBuilder()
.setMetadata(METADATA)
.addObjectDataRanges(
ObjectRangeData.newBuilder()
.setChecksummedData(content1.asChecksummedData())
.setReadRange(getReadRange(1, 10, 5))
.setRangeEnd(true)
.build())
.build();

ChecksummedTestContent content2 = ChecksummedTestContent.of(ALL_OBJECT_BYTES, 15, 5);
BidiReadObjectResponse res_read_2 =
BidiReadObjectResponse.newBuilder()
.setMetadata(METADATA)
.addObjectDataRanges(
ObjectRangeData.newBuilder()
.setChecksummedData(content2.asChecksummedData())
.setReadRange(getReadRange(2, 15, 5))
.setRangeEnd(true)
.build())
.build();

ChecksummedTestContent content3 = ChecksummedTestContent.of(ALL_OBJECT_BYTES, 20, 5);
BidiReadObjectResponse res_read_3 =
BidiReadObjectResponse.newBuilder()
.setMetadata(METADATA)
.addObjectDataRanges(
ObjectRangeData.newBuilder()
.setChecksummedData(content3.asChecksummedData())
.setReadRange(getReadRange(3, 20, 5))
.setRangeEnd(true)
.build())
.build();

FakeStorage fake =
FakeStorage.of(
ImmutableMap.<BidiReadObjectRequest, Consumer<StreamObserver<BidiReadObjectResponse>>>builder()
.put(REQ_OPEN, respond -> respond.onNext(RES_OPEN))
.put(req_read_1, onRedirect(handle1, "token-1"))
.put(req_read_1_redirected_1, respond -> respond.onNext(res_read_1))
.put(req_read_2, onRedirect(handle2, "token-2"))
.put(req_read_2_redirected_2, respond -> respond.onNext(res_read_2))
.put(req_read_3, onRedirect(handle3, "token-3"))
.put(req_read_3_redirected_3, onRedirect(handle4, "token-4"))
.put(req_read_3_redirected_4, onRedirect(handle5, "token-5"))
.put(req_read_3_redirected_5, respond -> respond.onNext(res_read_3))
.build());

try (FakeServer fakeServer = FakeServer.of(fake);
Storage storage = fakeServer.getGrpcStorageOptions().toBuilder().build().getService()) {

BlobId id = BlobId.of("b", "o");
ApiFuture<BlobReadSession> futureBlobDescriptor = storage.blobReadSession(id);

try (BlobReadSession bd = futureBlobDescriptor.get(5, TimeUnit.SECONDS)) {
// Read 1 (should trigger Redirect 1, then succeed)
byte[] actual1 =
bd.readAs(ReadProjectionConfigs.asFutureBytes().withRangeSpec(RangeSpec.of(10L, 5L)))
.get(1, TimeUnit.SECONDS);
assertThat(xxd(actual1)).isEqualTo(xxd(content1.getBytes()));

// Read 2 (should trigger Redirect 2, then succeed)
byte[] actual2 =
bd.readAs(ReadProjectionConfigs.asFutureBytes().withRangeSpec(RangeSpec.of(15L, 5L)))
.get(1, TimeUnit.SECONDS);
assertThat(xxd(actual2)).isEqualTo(xxd(content2.getBytes()));

// Read 3 (should trigger Redirect 3, Redirect 4, Redirect 5, then succeed)
byte[] actual3 =
bd.readAs(ReadProjectionConfigs.asFutureBytes().withRangeSpec(RangeSpec.of(20L, 5L)))
.get(1, TimeUnit.SECONDS);
assertThat(xxd(actual3)).isEqualTo(xxd(content3.getBytes()));
}
}
}

static final class FakeStorage extends StorageImplBase {

private final Map<BidiReadObjectRequest, Consumer<StreamObserver<BidiReadObjectResponse>>> db;
Expand All @@ -1823,6 +2024,7 @@ public void onNext(BidiReadObjectRequest req) {
if (db.containsKey(req)) {
db.get(req).accept(respond);
} else {
System.err.println("FakeStorage: UNEXPECTED REQUEST:\n" + req);
respond.onError(TestUtils.apiException(Code.UNIMPLEMENTED, "Unexpected request"));
}
}
Expand Down
Loading
Loading