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: remove grpclb #2760

Merged
merged 16 commits into from
Apr 20, 2024
Merged

feat: remove grpclb #2760

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3d549ed
chore: add DirectPath fallback integration test
mohanli-ml Nov 30, 2020
7a35667
Merge branch 'dp-branch'
mohanli-ml Dec 3, 2020
9851996
Merge remote-tracking branch 'upstream/master'
mohanli-ml Dec 15, 2020
bddf755
Merge remote-tracking branch 'upstream/master'
mohanli-ml Jan 5, 2021
35ffe0c
Merge remote-tracking branch 'upstream/master'
mohanli-ml Jan 7, 2021
d92dbf4
Merge branch 'main' of https://github.com/googleapis/java-spanner
mohanli-ml May 12, 2022
bb6efc2
Merge branch 'main' of https://github.com/googleapis/java-spanner
mohanli-ml Dec 18, 2023
3e3bdbc
feat: remove grpclb
mohanli-ml Dec 18, 2023
3a4f1b8
feat: remove grpclb
mohanli-ml Dec 18, 2023
7cb6952
Merge branch 'main' of https://github.com/googleapis/java-spanner
mohanli-ml Apr 18, 2024
f4f62ea
feat: remove grpclb
mohanli-ml Apr 18, 2024
1399ded
feat: remove grpclb
mohanli-ml Apr 18, 2024
6de55a9
Merge branch 'main' of https://github.com/googleapis/java-spanner
mohanli-ml Apr 19, 2024
2e41dba
Merge branch 'master' into remove-grpclb
mohanli-ml Apr 19, 2024
00a2e8d
feat: remove grpclb
mohanli-ml Apr 19, 2024
3a66eb2
Merge branch 'main' into remove-grpclb
olavloite Apr 20, 2024
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
Prev Previous commit
Next Next commit
feat: remove grpclb
  • Loading branch information
@mohanli-ml
mohanli-ml committed Dec 18, 2023
commit 3e3bdbc0c56cbb4c85bb99454876de1e7d31893c
27 changes: 6 additions & 21 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
SpannerInterceptorProvider.createDefault()))
// This sets the response compressor (Server -> Client).
.withEncoding(compressorName))
.setHeaderProvider(headerProviderWithUserAgent)
// Attempts direct access to spanner service over gRPC to improve throughput,
// whether the attempt is allowed is totally controlled by service owner.
.setAttemptDirectPath(true);
.setHeaderProvider(headerProviderWithUserAgent);

// If it is enabled in options uses the channel pool provided by the gRPC-GCP extension.
maybeEnableGrpcGcpExtension(defaultChannelProviderBuilder, options);
Expand All @@ -368,9 +365,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
try {
this.spannerStub =
GrpcSpannerStub.create(
options
.getSpannerStubSettings()
.toBuilder()
options.getSpannerStubSettings().toBuilder()
.setTransportChannelProvider(channelProvider)
.setCredentialsProvider(credentialsProvider)
.setStreamWatchdogProvider(watchdogProvider)
Expand All @@ -384,11 +379,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
this.executeQueryRetryableCodes =
options.getSpannerStubSettings().executeStreamingSqlSettings().getRetryableCodes();
partitionedDmlRetrySettings =
options
.getSpannerStubSettings()
.executeSqlSettings()
.getRetrySettings()
.toBuilder()
options.getSpannerStubSettings().executeSqlSettings().getRetrySettings().toBuilder()
.setInitialRpcTimeout(options.getPartitionedDmlTimeout())
.setMaxRpcTimeout(options.getPartitionedDmlTimeout())
.setTotalTimeout(options.getPartitionedDmlTimeout())
Expand Down Expand Up @@ -421,18 +412,14 @@ public GapicSpannerRpc(final SpannerOptions options) {

this.instanceAdminStub =
GrpcInstanceAdminStub.create(
options
.getInstanceAdminStubSettings()
.toBuilder()
options.getInstanceAdminStubSettings().toBuilder()
.setTransportChannelProvider(channelProvider)
.setCredentialsProvider(credentialsProvider)
.setStreamWatchdogProvider(watchdogProvider)
.build());

this.databaseAdminStubSettings =
options
.getDatabaseAdminStubSettings()
.toBuilder()
options.getDatabaseAdminStubSettings().toBuilder()
.setTransportChannelProvider(channelProvider)
.setCredentialsProvider(credentialsProvider)
.setStreamWatchdogProvider(watchdogProvider)
Expand Down Expand Up @@ -587,9 +574,7 @@ private static void checkEmulatorConnection(
// Do a quick check to see if the emulator is actually running.
try {
InstanceAdminStubSettings.Builder testEmulatorSettings =
options
.getInstanceAdminStubSettings()
.toBuilder()
options.getInstanceAdminStubSettings().toBuilder()
.setTransportChannelProvider(channelProvider)
.setCredentialsProvider(credentialsProvider);
testEmulatorSettings
Expand Down
Loading