Skip to content
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

Jump to bottom

feat: handle retry info so client respect the delay server sets #2026

Merged
merged 14 commits into from
Dec 19, 2023
Merged

feat: handle retry info so client respect the delay server sets #2026

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
11c5a24
feat: add a flag to add / remove routing cookie from callable chain
mutianf Dec 16, 2023
cd0996d
refactor
mutianf Dec 18, 2023
82f5cd7
mark as beta api
mutianf Dec 18, 2023
2b700b0
add a test for initial metadata
mutianf Dec 18, 2023
bec1f11
feat: handle retry info so client respect the delay server sets
mutianf Nov 21, 2023
eb0148f
fix conformance test
mutianf Dec 15, 2023
944a93f
remove unused class
mutianf Dec 15, 2023
5f6d583
address comments
mutianf Dec 17, 2023
a3ef1d1
add a flag for retry info and tests
mutianf Dec 17, 2023
cb519de
Merge branch 'main' into retry_info
mutianf Dec 18, 2023
8a92dfd
format
mutianf Dec 18, 2023
99c43c5
address comments
mutianf Dec 19, 2023
cf00661
fix format
mutianf Dec 19, 2023
06b3a18
rename ApiException
mutianf Dec 19, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
format
  • Loading branch information
@mutianf
mutianf committed Dec 18, 2023
commit 8a92dfd010e57763b778301d09eee8a594d94405
10 changes: 6 additions & 4 deletions ...d-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,10 +1066,11 @@ private <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> withRetries(
UnaryCallable<RequestT, ResponseT> innerCallable, UnaryCallSettings<?, ?> unaryCallSettings) {
UnaryCallable<RequestT, ResponseT> retrying;
if (settings.getEnableRetryInfo()) {
retrying = com.google.cloud.bigtable.gaxx.retrying.Callables.retrying(innerCallable, unaryCallSettings, clientContext);
} else {
retrying =
Callables.retrying(innerCallable, unaryCallSettings, clientContext);
com.google.cloud.bigtable.gaxx.retrying.Callables.retrying(
innerCallable, unaryCallSettings, clientContext);
} else {
retrying = Callables.retrying(innerCallable, unaryCallSettings, clientContext);
}
if (settings.getEnableRoutingCookie()) {
return new CookiesUnaryCallable<>(retrying);
Expand All @@ -1084,7 +1085,8 @@ private <RequestT, ResponseT> ServerStreamingCallable<RequestT, ResponseT> withR
ServerStreamingCallable<RequestT, ResponseT> retrying;
if (settings.getEnableRetryInfo()) {
retrying =
com.google.cloud.bigtable.gaxx.retrying.Callables.retrying(innerCallable, serverStreamingCallSettings, clientContext);
com.google.cloud.bigtable.gaxx.retrying.Callables.retrying(
innerCallable, serverStreamingCallSettings, clientContext);
} else {
retrying = Callables.retrying(innerCallable, serverStreamingCallSettings, clientContext);
}
Expand Down
26 changes: 13 additions & 13 deletions ...rc/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,10 +806,10 @@ public void routingCookieIsEnabled() throws IOException {
CredentialsProvider credentialsProvider = Mockito.mock(CredentialsProvider.class);
Mockito.when(credentialsProvider.getCredentials()).thenReturn(new FakeCredentials());
EnhancedBigtableStubSettings.Builder builder =
EnhancedBigtableStubSettings.newBuilder()
.setProjectId(dummyProjectId)
.setInstanceId(dummyInstanceId)
.setCredentialsProvider(credentialsProvider);
EnhancedBigtableStubSettings.newBuilder()
.setProjectId(dummyProjectId)
.setInstanceId(dummyInstanceId)
.setCredentialsProvider(credentialsProvider);

assertThat(builder.getEnableRoutingCookie()).isTrue();
assertThat(builder.build().getEnableRoutingCookie()).isTrue();
Expand All @@ -822,10 +822,10 @@ public void enableRetryInfoDefaultValueTest() throws IOException {
CredentialsProvider credentialsProvider = Mockito.mock(CredentialsProvider.class);
Mockito.when(credentialsProvider.getCredentials()).thenReturn(new FakeCredentials());
EnhancedBigtableStubSettings.Builder builder =
EnhancedBigtableStubSettings.newBuilder()
.setProjectId(dummyProjectId)
.setInstanceId(dummyInstanceId)
.setCredentialsProvider(credentialsProvider);
EnhancedBigtableStubSettings.newBuilder()
.setProjectId(dummyProjectId)
.setInstanceId(dummyInstanceId)
.setCredentialsProvider(credentialsProvider);
assertThat(builder.getEnableRetryInfo()).isTrue();
assertThat(builder.build().getEnableRetryInfo()).isTrue();
assertThat(builder.build().toBuilder().getEnableRetryInfo()).isTrue();
Expand All @@ -838,11 +838,11 @@ public void routingCookieFalseValueSet() throws IOException {
CredentialsProvider credentialsProvider = Mockito.mock(CredentialsProvider.class);
Mockito.when(credentialsProvider.getCredentials()).thenReturn(new FakeCredentials());
EnhancedBigtableStubSettings.Builder builder =
EnhancedBigtableStubSettings.newBuilder()
.setProjectId(dummyProjectId)
.setInstanceId(dummyInstanceId)
.setEnableRoutingCookie(false)
.setCredentialsProvider(credentialsProvider);
EnhancedBigtableStubSettings.newBuilder()
.setProjectId(dummyProjectId)
.setInstanceId(dummyInstanceId)
.setEnableRoutingCookie(false)
.setCredentialsProvider(credentialsProvider);
assertThat(builder.getEnableRoutingCookie()).isFalse();
assertThat(builder.build().getEnableRoutingCookie()).isFalse();
assertThat(builder.build().toBuilder().getEnableRoutingCookie()).isFalse();
Expand Down
Loading