diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-05-20 12:49:20 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-05-20 12:49:20 +0300 |
| commit | 116eb92bc5b99016c3a0b8c49c2b959adaacf45f (patch) | |
| tree | 9bb1d1ff05c80558ea6a7e307a036cad0643bf7d | |
| parent | 60071ef3253c44f68a614d1367c27206b84d3040 (diff) | |
| parent | 43ddbc3937304e8a22a201cb0fa105bb0af27a83 (diff) | |
Merge branch 'smh-respect-disable-failover-in-per-repo' into 'master'
Respect failover disabled config option with per_repository elector
See merge request gitlab-org/gitaly!3491
| -rw-r--r-- | cmd/praefect/main.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cmd/praefect/main.go b/cmd/praefect/main.go index b2607bd18..3f8ee04d1 100644 --- a/cmd/praefect/main.go +++ b/cmd/praefect/main.go @@ -322,11 +322,14 @@ func run(cfgs []starter.Config, conf config.Config) error { healthChecker = hm elector := nodes.NewPerRepositoryElector(logger, db, hm) - go func() { - if err := elector.Run(ctx, hm.Updated()); err != nil { - logger.WithError(err).Error("primary elector exited") - } - }() + + if conf.Failover.Enabled { + go func() { + if err := elector.Run(ctx, hm.Updated()); err != nil { + logger.WithError(err).Error("primary elector exited") + } + }() + } primaryGetter = elector assignmentStore = datastore.NewAssignmentStore(db, conf.StorageNames()) |