kvtenant: replace InternalClient with more specific services' client adapters #148486
Conversation
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
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Member
|
This change is |
shubhamdhama
commented
Jun 20, 2025
| } | ||
|
|
||
| func (c *connector) tryForgetClient(ctx context.Context, client kvpb.InternalClient) { | ||
| func (c *connector) tryForgetClient(ctx context.Context, client any) { |
Contributor
Author
There was a problem hiding this comment.
Chandra: change this from any to *client
shubhamdhama
force-pushed
the
tenant-connector-replace-internal-client
branch
from
2828ef1 to
f9f4a21
Compare
…adapters
Since we have broken down the `Internal` service into smaller services,
this PR uses them in the tenant connector.
This means the `client.InternalClient` will be replaced by
`RPCTenantServiceClient`, `RPCTenantUsageClient`, and
`RPCTenantSpanConfigClient`, as they are used by the tenant connector. For
gRPC, they can be initialized with the gRPC adapter of `InternalClient`
returned by `NewGRPCInternalClientAdapter`, as these smaller services are a
subset of the `Internal` service.
However, a complication arises with `RPCTenantSpanConfigClient`. We can't
simply use the generic `InternalClient` adapter because its streaming
methods generate request/response types that embed the service name.
For example: Let's take an example here:
`RPCTenantServiceClient` has this method:
```go
TenantSettings(ctx context.Context, in *TenantSettingsRequest) (RPCTenantService_TenantSettingsClient, error)
```
But `NewGRPCInternalClientAdapter` returns `RPCInternalClient`, which
defines:
```go
TenantSettings(ctx context.Context, in *TenantSettingsRequest) (RPCInternal_TenantSettingsClient, error)
```
So they are not compatible, even though `RPCInternal_TenantSettingsClient`
and `RPCTenantService_TenantSettingsClient` are equivalent. The solution
here is to create an adapter that adapts the `InternalClient`
to `RPCTenantServiceClient`.
```go
func (a *grpcInternalToTenantServiceClientAdapter) TenantSettings(
ctx context.Context, in *TenantSettingsRequest,
) (RPCTenantService_TenantSettingsClient, error) {
return (*internalClient)(a).TenantSettings(ctx, in)
}
```
Release note: none
Epic: CRDB-48923
shubhamdhama
force-pushed
the
tenant-connector-replace-internal-client
branch
from
f9f4a21 to
bcd8dd3
Compare
Contributor
Author
|
TFTR! bors r=cthumuluru-crdb |
Contributor
celeste-cockroachdb
bot
added
v25.3.0-prerelease
and removed
target-release-25.3.0
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Since we have broken down the
Internalservice into smaller services, this PR uses them in the tenant connector.This means the
client.InternalClientwill be replaced byRPCTenantServiceClient,RPCTenantUsageClient, andRPCTenantSpanConfigClient, as they are used by the tenant connector. For gRPC, they can be initialized with the gRPC adapter ofInternalClientreturned byNewGRPCInternalClientAdapter, as these smaller services are a subset of theInternalservice.However, a complication arises with
RPCTenantSpanConfigClient. We can't simply use the genericInternalClientadapter because its streaming methods generate request/response types that embed the service name.For example: Let's take an example here:
RPCTenantServiceClienthas this method:But
NewGRPCInternalClientAdapterreturnsRPCInternalClient, which defines:So they are not compatible, even though
RPCInternal_TenantSettingsClientandRPCTenantService_TenantSettingsClientare equivalent. The solution here is to create an adapter that adapts theInternalClienttoRPCTenantServiceClient.Informs: #148726
Release note: none
Epic: CRDB-48923