Skip to content

kv,server: extract Cluster service and register with DRPC server #148451

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

Merged
merged 2 commits into from
Jun 20, 2025
Merged

kv,server: extract Cluster service and register with DRPC server #148451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d18382e
kv,server: extract `Cluster` service and register with DRPC server
shubhamdhama Jun 17, 2025
b884f97
server: replace `RPCClusterClient` for cluster join operation
shubhamdhama Jun 17, 2025
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
8 changes: 8 additions & 0 deletions pkg/kv/kvpb/api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3712,6 +3712,14 @@ service TenantSpanConfig {
rpc SpanConfigConformance(SpanConfigConformanceRequest) returns (SpanConfigConformanceResponse) {}
}

// Cluster service offers RPCs for inter-node communication essential for
// cluster bootstrapping and operation.
service Cluster {
// Join a bootstrapped cluster. If the target node is itself not part of a
// bootstrapped cluster, an appropriate error is returned.
rpc Join (JoinNodeRequest) returns (JoinNodeResponse) {}
}

// Batch and RangeFeed service implemented by nodes for KV API requests.
service Internal {
rpc Batch (BatchRequest) returns (BatchResponse) {}
Expand Down
5 changes: 4 additions & 1 deletion pkg/server/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,10 @@ func (s *initServer) attemptJoinTo(
BinaryVersion: &latestVersion,
}

initClient := kvpb.NewInternalClient(conn)
var initClient kvpb.RPCClusterClient
if !rpcbase.TODODRPC {
initClient = kvpb.NewGRPCInternalClientAdapter(conn)
}
resp, err := initClient.Join(ctx, req)
if err != nil {
status, ok := grpcstatus.FromError(errors.UnwrapAll(err))
Expand Down
3 changes: 3 additions & 0 deletions pkg/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,9 @@ func NewServer(cfg Config, stopper *stop.Stopper) (serverctl.ServerStartupInterf
if err := kvpb.DRPCRegisterTenantSpanConfig(drpcServer, node); err != nil {
return nil, err
}
if err := kvpb.DRPCRegisterCluster(drpcServer, node); err != nil {
return nil, err
}
kvserver.RegisterPerReplicaServer(grpcServer.Server, node.perReplicaServer)
if err := kvserver.DRPCRegisterPerReplica(drpcServer, node.perReplicaServer); err != nil {
return nil, err
Expand Down