diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2021-03-26 13:12:29 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2021-04-01 12:50:49 +0300 |
| commit | 54f0de751b48b23424640cd851a8222b5025f6bc (patch) | |
| tree | 29fd9d9aebee872680e38faf48fa5f6a97abd95d /cmd/praefect/main.go | |
| parent | 6f68e2cb582b272336963761181d1b0759fb5b22 (diff) | |
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.
Diffstat (limited to 'cmd/praefect/main.go')
| -rw-r--r-- | cmd/praefect/main.go | 8 |
1 files changed, 3 insertions, 5 deletions
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, ) ) |