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 4 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
4 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
ee8a737
test: add bidiWriteObjectRedirectedError_redirectCounterResetOnRespon…
nidhiii-27 Aug 21, 2026
61f4ee8
style: format java files using spotify-java-formatter
nidhiii-27 Aug 21, 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
210 changes: 210 additions & 0 deletions ...ogle-cloud-storage/src/test/java/com/google/cloud/storage/ITAppendableUploadFakeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,216 @@ public void bidiWriteObjectRedirectedError_maxAttempts() throws Exception {
}
}

@Test
public void bidiWriteObjectRedirectedError_redirectCounterResetOnResponse() throws Exception {
String routingToken1 = "routingToken1";
String routingToken2 = "routingToken2";
String routingToken3 = "routingToken3";
String routingToken4 = "routingToken4";
String routingToken5 = "routingToken5";

BidiWriteHandle writeHandle1 =
BidiWriteHandle.newBuilder().setHandle(ByteString.copyFromUtf8("handle-1")).build();
BidiWriteHandle writeHandle2 =
BidiWriteHandle.newBuilder().setHandle(ByteString.copyFromUtf8("handle-2")).build();
BidiWriteHandle writeHandle3 =
BidiWriteHandle.newBuilder().setHandle(ByteString.copyFromUtf8("handle-3")).build();

// 1. First write of "ABC".
BidiWriteObjectRequest req_open_abc = BidiUploadTestUtils.withFlushAndStateLookup(open_abc);
BidiWriteObjectResponse res_abc_h1 = res_abc.toBuilder().setWriteHandle(writeHandle1).build();

// 2. Second write of "DEF".
BidiWriteObjectRequest req_def = BidiUploadTestUtils.withFlushAndStateLookup(def);
BidiWriteObjectResponse res_def_success =
BidiWriteObjectResponse.newBuilder()
.setWriteHandle(writeHandle1)
.setPersistedSize(6)
.build();

// 3. Reconnect to routingToken1
BidiWriteObjectRequest reconnect_token1 =
BidiWriteObjectRequest.newBuilder()
.setAppendObjectSpec(
AppendObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(METADATA.getGeneration())
.setWriteHandle(writeHandle1)
.setRoutingToken(routingToken1)
.build())
.setStateLookup(true)
.build();
BidiWriteObjectResponse res_lookup_token1 =
BidiWriteObjectResponse.newBuilder()
.setWriteHandle(writeHandle1)
.setPersistedSize(3)
.build();

// 5. Third write of "GHI".
BidiWriteObjectRequest req_ghi = BidiUploadTestUtils.withFlushAndStateLookup(ghi);
BidiWriteObjectResponse res_ghi_success =
BidiWriteObjectResponse.newBuilder()
.setWriteHandle(writeHandle2)
.setPersistedSize(9)
.build();

// 6. Reconnect to routingToken2
BidiWriteObjectRequest reconnect_token2 =
BidiWriteObjectRequest.newBuilder()
.setAppendObjectSpec(
AppendObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(METADATA.getGeneration())
.setWriteHandle(writeHandle1)
.setRoutingToken(routingToken2)
.build())
.setStateLookup(true)
.build();
BidiWriteObjectResponse res_lookup_token2 =
BidiWriteObjectResponse.newBuilder()
.setWriteHandle(writeHandle2)
.setPersistedSize(6)
.build();

// 8. Fourth write of "J" (finalize/finish write)
BidiWriteObjectRequest req_j_finish = j_finish;
BidiWriteObjectResponse res_j_final =
resource_10.toBuilder().setWriteHandle(writeHandle3).build();

// 9. Reconnect to routingToken3
BidiWriteObjectRequest reconnect_token3 =
BidiWriteObjectRequest.newBuilder()
.setAppendObjectSpec(
AppendObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(METADATA.getGeneration())
.setWriteHandle(writeHandle2)
.setRoutingToken(routingToken3)
.build())
.setStateLookup(true)
.build();

// 10. Reconnect to routingToken4
BidiWriteObjectRequest reconnect_token4 =
BidiWriteObjectRequest.newBuilder()
.setAppendObjectSpec(
AppendObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(METADATA.getGeneration())
.setWriteHandle(writeHandle2)
.setRoutingToken(routingToken4)
.build())
.setStateLookup(true)
.build();

// 11. Reconnect to routingToken5
BidiWriteObjectRequest reconnect_token5 =
BidiWriteObjectRequest.newBuilder()
.setAppendObjectSpec(
AppendObjectSpec.newBuilder()
.setBucket(METADATA.getBucket())
.setObject(METADATA.getName())
.setGeneration(METADATA.getGeneration())
.setWriteHandle(writeHandle2)
.setRoutingToken(routingToken5)
.build())
.setStateLookup(true)
.build();
BidiWriteObjectResponse res_lookup_token5 =
BidiWriteObjectResponse.newBuilder()
.setWriteHandle(writeHandle3)
.setPersistedSize(9)
.build();

AtomicInteger defCounter = new AtomicInteger();
Consumer<StreamObserver<BidiWriteObjectResponse>> defHandler =
respond -> {
if (defCounter.getAndIncrement() == 0) {
respond.onError(packRedirectIntoAbortedException(makeRedirect(routingToken1)));
} else {
respond.onNext(res_def_success);
}
};

AtomicInteger ghiCounter = new AtomicInteger();
Consumer<StreamObserver<BidiWriteObjectResponse>> ghiHandler =
respond -> {
if (ghiCounter.getAndIncrement() == 0) {
respond.onError(packRedirectIntoAbortedException(makeRedirect(routingToken2)));
} else {
respond.onNext(res_ghi_success);
}
};

AtomicInteger jCounter = new AtomicInteger();
Consumer<StreamObserver<BidiWriteObjectResponse>> jHandler =
respond -> {
if (jCounter.getAndIncrement() == 0) {
respond.onError(packRedirectIntoAbortedException(makeRedirect(routingToken3)));
} else {
respond.onNext(res_j_final);
respond.onCompleted();
}
};

FakeStorage fake =
FakeStorage.of(
ImmutableMap
.<BidiWriteObjectRequest, Consumer<StreamObserver<BidiWriteObjectResponse>>>
builder()
.put(req_open_abc, respond -> respond.onNext(res_abc_h1))
.put(req_def, defHandler)
.put(reconnect_token1, respond -> respond.onNext(res_lookup_token1))
.put(req_ghi, ghiHandler)
.put(reconnect_token2, respond -> respond.onNext(res_lookup_token2))
.put(req_j_finish, jHandler)
.put(
reconnect_token3,
respond ->
respond.onError(
packRedirectIntoAbortedException(makeRedirect(routingToken4))))
.put(
reconnect_token4,
respond ->
respond.onError(
packRedirectIntoAbortedException(makeRedirect(routingToken5))))
.put(reconnect_token5, respond -> respond.onNext(res_lookup_token5))
.build());

try (FakeServer fakeServer = FakeServer.of(fake);
Storage storage =
fakeServer.getGrpcStorageOptions().toBuilder()
.setRetrySettings(
fakeServer.getGrpcStorageOptions().getRetrySettings().toBuilder()
.setRetryDelayMultiplier(1.0)
.setInitialRetryDelayDuration(Duration.ofMillis(10))
.build())
.build()
.getService()) {

BlobId id = BlobId.of("b", "o");
BlobAppendableUploadConfig config =
BlobAppendableUploadConfig.of()
.withFlushPolicy(FlushPolicy.maxFlushSize(3))
.withCloseAction(CloseAction.FINALIZE_WHEN_CLOSING);
BlobAppendableUpload b =
storage.blobAppendableUpload(BlobInfo.newBuilder(id).build(), config);
try (AppendableUploadWriteableByteChannel channel = b.open()) {
ByteBuffer wrap = ByteBuffer.wrap(content.getBytes());
Buffers.emptyTo(wrap, channel);
}

// Verification
ApiFuture<BlobInfo> resultFuture = b.getResult();
BlobInfo finalMetadata = resultFuture.get(3, TimeUnit.SECONDS);
assertThat(finalMetadata.getSize()).isEqualTo(10L);
}
}

/**
* We use a small segmenter (3 byte segments) and flush "ABCDEFGHIJ". We make sure that this
* resolves to segments of "ABC"/"DEF"/"GHI"/"J".
Expand Down
Loading
Loading