diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2021-08-19 18:50:36 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2021-08-19 19:22:39 +0300 |
| commit | 1fcf22c1049579a1e9d5d4d1fcccfe1e37889028 (patch) | |
| tree | 2a2302ef3de92e3f8d13c22a7bd806df7fa2e670 /internal/praefect | |
| parent | 73eb0f44c0484f4730ca334c9b27e8cd0ad9ec86 (diff) | |
Do not inject replication queue into InfoService
InfoService previously used the replication queue to schedule replication
jobs as part of the manual reconciliation command and when accepting
data loss. The manual reconciler has been removed and accepting data loss
relies on the automatic reconciler. As the InfoService no longer needs to
queue replication jobs, this commit removes the unnecessary field and updates
the call sites not to inject the queue.
Diffstat (limited to 'internal/praefect')
| -rw-r--r-- | internal/praefect/server.go | 2 | ||||
| -rw-r--r-- | internal/praefect/service/info/server.go | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/internal/praefect/server.go b/internal/praefect/server.go index 017d6742f..4eb4b1c4c 100644 --- a/internal/praefect/server.go +++ b/internal/praefect/server.go @@ -154,7 +154,7 @@ func registerServices( ) { // ServerServiceServer is necessary for the ServerInfo RPC gitalypb.RegisterServerServiceServer(srv, server.NewServer(conf, conns)) - gitalypb.RegisterPraefectInfoServiceServer(srv, info.NewServer(conf, queue, rs, assignmentStore, conns, primaryGetter)) + gitalypb.RegisterPraefectInfoServiceServer(srv, info.NewServer(conf, rs, assignmentStore, conns, primaryGetter)) gitalypb.RegisterRefTransactionServer(srv, transaction.NewServer(tm)) healthpb.RegisterHealthServer(srv, health.NewServer()) diff --git a/internal/praefect/service/info/server.go b/internal/praefect/service/info/server.go index 802dd9164..8ab27ab55 100644 --- a/internal/praefect/service/info/server.go +++ b/internal/praefect/service/info/server.go @@ -37,7 +37,6 @@ type PrimaryGetter interface { type Server struct { gitalypb.UnimplementedPraefectInfoServiceServer conf config.Config - queue datastore.ReplicationEventQueue rs datastore.RepositoryStore assignmentStore AssignmentStore conns service.Connections @@ -47,7 +46,6 @@ type Server struct { // NewServer creates a new instance of a grpc InfoServiceServer func NewServer( conf config.Config, - queue datastore.ReplicationEventQueue, rs datastore.RepositoryStore, assignmentStore AssignmentStore, conns service.Connections, @@ -55,7 +53,6 @@ func NewServer( ) gitalypb.PraefectInfoServiceServer { return &Server{ conf: conf, - queue: queue, rs: rs, assignmentStore: assignmentStore, conns: conns, |