From 54f0de751b48b23424640cd851a8222b5025f6bc Mon Sep 17 00:00:00 2001 From: Sami Hiltunen Date: Fri, 26 Mar 2021 11:12:29 +0100 Subject: Add DisabledAssignmentStore to use when assignments are disabled Praefect can still be configured to run without the database. To support such a configuration, this commit adds a DisabledAssignmentStore which can be plugged in if the database is not used. It simply returns all storages as assigned and doesn't allow for configuring replication factors. --- cmd/praefect/main.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'cmd/praefect/main.go') diff --git a/cmd/praefect/main.go b/cmd/praefect/main.go index 156b89425..0e229b8fb 100644 --- a/cmd/praefect/main.go +++ b/cmd/praefect/main.go @@ -108,7 +108,6 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" "gitlab.com/gitlab-org/gitaly/internal/praefect/reconciler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/info" "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" "gitlab.com/gitlab-org/gitaly/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" @@ -239,7 +238,6 @@ func run(cfgs []starter.Config, conf config.Config) error { var rs datastore.RepositoryStore var csg datastore.ConsistentStoragesGetter var metricsCollectors []prometheus.Collector - var replicationFactorSetter info.ReplicationFactorSetter if conf.MemoryQueueEnabled { queue = datastore.NewMemoryReplicationEventQueue(conf) @@ -301,6 +299,7 @@ func run(cfgs []starter.Config, conf config.Config) error { return err } + assignmentStore := praefect.NewDisabledAssignmentStore(conf.StorageNames()) var ( healthChecker praefect.HealthChecker nodeSet praefect.NodeSet @@ -328,8 +327,7 @@ func run(cfgs []starter.Config, conf config.Config) error { } }() - assignmentStore := datastore.NewAssignmentStore(db, conf.StorageNames()) - replicationFactorSetter = assignmentStore + assignmentStore = datastore.NewAssignmentStore(db, conf.StorageNames()) router = praefect.NewPerRepositoryRouter( nodeSet.Connections(), @@ -383,7 +381,7 @@ func run(cfgs []starter.Config, conf config.Config) error { transactionManager, queue, rs, - replicationFactorSetter, + assignmentStore, protoregistry.GitalyProtoPreregistered, ) ) -- cgit v1.2.3