Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

test: workaround existing bug in gax that prevents conformance tests from passing #1772

Merged
gcf-merge-on-green merged 4 commits into from
May 30, 2023
Merged

test: workaround existing bug in gax that prevents conformance tests from passing #1772

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68d2bc7
test: workaround existing bug in gax that prevents conformance tests …
igorbernstein2 May 30, 2023
2ae5d70
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 30, 2023
49ee227
update sample row keys
igorbernstein2 May 30, 2023
e68f7bd
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 30, 2023
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
66 changes: 25 additions & 41 deletions test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/CbtTestProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.api.gax.core.NoCredentialsProvider;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.retrying.RetrySettings;
import com.google.api.gax.rpc.ApiException;
import com.google.api.gax.rpc.ServerStream;
import com.google.auth.oauth2.GoogleCredentials;
Expand Down Expand Up @@ -146,51 +147,34 @@ public static CbtTestProxy createEncrypted(
*/
private static BigtableDataSettings.Builder overrideTimeoutSetting(
Duration newTimeout, BigtableDataSettings.Builder settingsBuilder) {
// TODO(developer): remove the initialRpcTimeout update below by updating the client library.
Duration initialRpcTimeout =
settingsBuilder
.stubSettings()
.bulkMutateRowsSettings()
.getRetrySettings()
.getInitialRpcTimeout();
if (initialRpcTimeout.compareTo(newTimeout) > 0) {
// Total timeout is smaller than initialRpcTimeout, which will cause deadline-related problem.
initialRpcTimeout = newTimeout;
}
settingsBuilder
.stubSettings()
.bulkMutateRowsSettings()
.retrySettings()
.setTotalTimeout(newTimeout)
.setInitialRpcTimeout(initialRpcTimeout);

settingsBuilder.stubSettings().mutateRowSettings().retrySettings().setTotalTimeout(newTimeout);

settingsBuilder.stubSettings().readRowSettings().retrySettings().setTotalTimeout(newTimeout);

settingsBuilder.stubSettings().readRowsSettings().retrySettings().setTotalTimeout(newTimeout);

settingsBuilder
.stubSettings()
.sampleRowKeysSettings()
Comment thread
igorbernstein2 marked this conversation as resolved.
.retrySettings()
.setTotalTimeout(newTimeout);

settingsBuilder
.stubSettings()
.checkAndMutateRowSettings()
.retrySettings()
.setTotalTimeout(newTimeout);

settingsBuilder
.stubSettings()
.readModifyWriteRowSettings()
.retrySettings()
.setTotalTimeout(newTimeout);

updateTimeout(
settingsBuilder.stubSettings().bulkMutateRowsSettings().retrySettings(), newTimeout);
updateTimeout(settingsBuilder.stubSettings().mutateRowSettings().retrySettings(), newTimeout);
updateTimeout(settingsBuilder.stubSettings().readRowSettings().retrySettings(), newTimeout);
updateTimeout(settingsBuilder.stubSettings().readRowsSettings().retrySettings(), newTimeout);
updateTimeout(
settingsBuilder.stubSettings().checkAndMutateRowSettings().retrySettings(), newTimeout);
updateTimeout(
settingsBuilder.stubSettings().readModifyWriteRowSettings().retrySettings(), newTimeout);
updateTimeout(
settingsBuilder.stubSettings().sampleRowKeysSettings().retrySettings(), newTimeout);

return settingsBuilder;
}

private static void updateTimeout(RetrySettings.Builder settings, Duration newTimeout) {
Duration rpcTimeout = settings.getInitialRpcTimeout();

// TODO: this should happen in gax
// Clamp the rpcTimeout to the overall timeout
if (rpcTimeout != null && rpcTimeout.compareTo(newTimeout) > 0) {
settings.setInitialRpcTimeout(newTimeout).setMaxRpcTimeout(newTimeout);
}

settings.setTotalTimeout(newTimeout);
}

/** Helper method to get a client object by its id. */
private CbtClient getClient(String id) throws StatusException {
CbtClient client = idClientMap.get(id);
Expand Down