Skip to content

Commit 81c8bc6

Browse files
craig[bot]shubhamdhama
andcommitted
Merge #148897
148897: server: rename `Cluster` service to `Node` service r=cthumuluru-crdb a=shubhamdhama Renaming the `Cluster` service to `Node`. This new name is more appropriate because the service's functionality is provided by an individual node, rather than by the cluster as a whole. This is not a breaking change, as these services are currently used for DRPC only. Epic: none Release note: none Co-authored-by: Shubham Dhama <[email protected]>
2 parents e5d1c94 + c057d22 commit 81c8bc6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

pkg/kv/kvpb/api.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3747,9 +3747,9 @@ service TenantSpanConfig {
37473747
rpc SpanConfigConformance(SpanConfigConformanceRequest) returns (SpanConfigConformanceResponse) {}
37483748
}
37493749

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

pkg/server/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ func (s *initServer) attemptJoinTo(
466466
BinaryVersion: &latestVersion,
467467
}
468468

469-
var initClient kvpb.RPCClusterClient
469+
var initClient kvpb.RPCNodeClient
470470
if !rpcbase.TODODRPC {
471471
initClient = kvpb.NewGRPCInternalClientAdapter(conn)
472472
}

pkg/server/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ func NewServer(cfg Config, stopper *stop.Stopper) (serverctl.ServerStartupInterf
999999
if err := kvpb.DRPCRegisterTenantSpanConfig(drpcServer, node); err != nil {
10001000
return nil, err
10011001
}
1002-
if err := kvpb.DRPCRegisterCluster(drpcServer, node); err != nil {
1002+
if err := kvpb.DRPCRegisterNode(drpcServer, node); err != nil {
10031003
return nil, err
10041004
}
10051005
kvserver.RegisterPerReplicaServer(grpcServer.Server, node.perReplicaServer)

0 commit comments

Comments
 (0)