Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Okstad <pokstad@gitlab.com>2020-03-20 09:21:03 +0300
committerPaul Okstad <pokstad@gitlab.com>2020-03-20 09:21:03 +0300
commit1bb075dd1fd0b6d840ba2c59f8aaac1542655ee7 (patch)
tree78581a7150400518a07458bd16734a13e10ff1b6 /internal/praefect/server.go
parent969bac80e2f246867c1a976864bd1f5b34ee43dd (diff)
RPC ConsistencyCheck and Praefect "reconcile" subcommand
Diffstat (limited to 'internal/praefect/server.go')
-rw-r--r--internal/praefect/server.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/internal/praefect/server.go b/internal/praefect/server.go
index 41f21974e..8b85edb45 100644
--- a/internal/praefect/server.go
+++ b/internal/praefect/server.go
@@ -17,6 +17,7 @@ import (
"gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler"
"gitlab.com/gitlab-org/gitaly/internal/middleware/sentryhandler"
"gitlab.com/gitlab-org/gitaly/internal/praefect/config"
+ "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore"
"gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy"
"gitlab.com/gitlab-org/gitaly/internal/praefect/middleware"
"gitlab.com/gitlab-org/gitaly/internal/praefect/nodes"
@@ -122,10 +123,10 @@ func (srv *Server) Serve(l net.Listener, secure bool) error {
}
// RegisterServices will register any services praefect needs to handle rpcs on its own
-func (srv *Server) RegisterServices(nm nodes.Manager, conf config.Config) {
+func (srv *Server) RegisterServices(nm nodes.Manager, conf config.Config, ds datastore.Datastore) {
// ServerServiceServer is necessary for the ServerInfo RPC
gitalypb.RegisterServerServiceServer(srv.s, server.NewServer(conf, nm))
- gitalypb.RegisterPraefectInfoServiceServer(srv.s, info.NewServer(nm))
+ gitalypb.RegisterPraefectInfoServiceServer(srv.s, info.NewServer(nm, conf, ds))
healthpb.RegisterHealthServer(srv.s, health.NewServer())
grpc_prometheus.Register(srv.s)