-
Notifications
You must be signed in to change notification settings - Fork 136
feat: experimental location aware routing- Part 4 #4295
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.
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
Open
rahul2393
wants to merge
3
commits into
main
Choose a base branch
from
feat/key-range-cache
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/ChannelFinderServer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Copyright 2026 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.spanner.spi.v1; | ||
|
|
||
| import io.grpc.ManagedChannel; | ||
|
|
||
| /** Represents a Spanner server endpoint for location-aware routing. */ | ||
| public interface ChannelFinderServer { | ||
| String getAddress(); | ||
|
|
||
| boolean isHealthy(); | ||
|
|
||
| ManagedChannel getChannel(); // Added to get the underlying channel for RPC calls | ||
| } |
24 changes: 24 additions & 0 deletions
24
...oud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/ChannelFinderServerFactory.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Copyright 2026 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.spanner.spi.v1; | ||
|
|
||
| /** Factory for creating and caching server connections for location-aware routing. */ | ||
| public interface ChannelFinderServerFactory { | ||
| ChannelFinderServer defaultServer(); | ||
|
|
||
| ChannelFinderServer create(String address); | ||
| } |
98 changes: 98 additions & 0 deletions
98
...spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcChannelFinderServerFactory.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * Copyright 2026 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.spanner.spi.v1; | ||
|
|
||
| import com.google.api.gax.grpc.GrpcTransportChannel; | ||
| import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; | ||
| import io.grpc.ManagedChannel; | ||
| import java.io.IOException; | ||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| class GrpcChannelFinderServerFactory implements ChannelFinderServerFactory { | ||
| private final InstantiatingGrpcChannelProvider.Builder channelBuilder; | ||
| private final Map<String, GrpcChannelFinderServer> servers = new ConcurrentHashMap<>(); | ||
| private final GrpcChannelFinderServer defaultServer; | ||
|
|
||
| public GrpcChannelFinderServerFactory(InstantiatingGrpcChannelProvider.Builder channelBuilder) | ||
| throws IOException { | ||
| this.channelBuilder = channelBuilder; | ||
| // The "default" server will use the original endpoint from the builder. | ||
| this.defaultServer = | ||
| new GrpcChannelFinderServer(this.channelBuilder.getEndpoint(), channelBuilder.build()); | ||
| this.servers.put(this.defaultServer.getAddress(), this.defaultServer); | ||
| } | ||
|
|
||
| @Override | ||
| public ChannelFinderServer defaultServer() { | ||
| return defaultServer; | ||
| } | ||
|
|
||
| @Override | ||
| public ChannelFinderServer create(String address) { | ||
| return servers.computeIfAbsent( | ||
| address, | ||
| addr -> { | ||
| try { | ||
| // Modify the builder to use the new address | ||
| synchronized (channelBuilder) { | ||
| InstantiatingGrpcChannelProvider.Builder newBuilder = | ||
| channelBuilder.setEndpoint(addr); | ||
| return new GrpcChannelFinderServer(addr, newBuilder.build()); | ||
| } | ||
| } catch (IOException e) { | ||
| throw new RuntimeException("Failed to create channel for address: " + addr, e); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| static class GrpcChannelFinderServer implements ChannelFinderServer { | ||
| private final String address; | ||
| private final ManagedChannel channel; | ||
|
|
||
| public GrpcChannelFinderServer(String address, InstantiatingGrpcChannelProvider provider) | ||
| throws IOException { | ||
| this.address = address; | ||
| // It's assumed that getTransportChannel() returns a ManagedChannel or can be cast to one. | ||
| // For this example, GrpcTransportChannel is used as in KeyAwareChannel. | ||
| GrpcTransportChannel transportChannel = (GrpcTransportChannel) provider.getTransportChannel(); | ||
| this.channel = (ManagedChannel) transportChannel.getChannel(); | ||
| } | ||
|
|
||
| // Constructor for the default server that already has a channel | ||
| public GrpcChannelFinderServer(String address, ManagedChannel channel) { | ||
| this.address = address; | ||
| this.channel = channel; | ||
| } | ||
|
|
||
| @Override | ||
| public String getAddress() { | ||
| return address; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isHealthy() { | ||
| // A simple health check. In a real scenario, this might involve a ping or other checks. | ||
| return !channel.isShutdown() && !channel.isTerminated(); | ||
| } | ||
|
|
||
| @Override | ||
| public ManagedChannel getChannel() { | ||
| return channel; | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
createmethod has a concurrency issue. It modifies the sharedchannelBuilderby callingsetEndpoint(), but it doesn't restore the original endpoint. This can lead to other threads creating channels for incorrect endpoints. You should save and restore the original endpoint within the synchronized block to ensure thread safety.