Skip to content

Commit 68ba93b

Browse files
craig[bot]cthumuluru-crdb
andcommitted
Merge #148651
148651: server: register Init,Migration,KeyVisualizer services with DRPC server r=cthumuluru-crdb a=cthumuluru-crdb Enable the Init, Migration, KeyVisualizer services on the DRPC server in addition to gRPC. This is controlled by `rpc.experimental_drpc.enabled` (off by default). This change is part of a series and is similar to: #146926 Note: This only registers the service; the client is not updated to use the DRPC client, so this service will not have any functional effect. Epic: CRDB-48925 Release note: None Co-authored-by: Chandra Thumuluru <[email protected]>
2 parents e883406 + d886676 commit 68ba93b

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

pkg/server/server.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,14 +1582,23 @@ func (s *topLevelServer) PreStart(ctx context.Context) error {
15821582
}
15831583

15841584
serverpb.RegisterInitServer(s.grpc.Server, initServer)
1585+
if err := serverpb.DRPCRegisterInit(s.drpc.DRPCServer, initServer); err != nil {
1586+
return err
1587+
}
15851588

15861589
// Register the Migration service, to power internal crdb upgrades.
15871590
migrationServer := &migrationServer{server: s}
15881591
serverpb.RegisterMigrationServer(s.grpc.Server, migrationServer)
1592+
if err := serverpb.DRPCRegisterMigration(s.drpc.DRPCServer, migrationServer); err != nil {
1593+
return err
1594+
}
15891595
s.migrationServer = migrationServer // only for testing via testServer
15901596

15911597
// Register the KeyVisualizer Server
15921598
keyvispb.RegisterKeyVisualizerServer(s.grpc.Server, s.keyVisualizerServer)
1599+
if err := keyvispb.DRPCRegisterKeyVisualizer(s.drpc.DRPCServer, s.keyVisualizerServer); err != nil {
1600+
return err
1601+
}
15931602

15941603
// Start the RPC server. This opens the RPC/SQL listen socket,
15951604
// and dispatches the server worker for the RPC.

0 commit comments

Comments
 (0)