Skip to content

Commit

Permalink
fix (frontend OR worker) and scheduler boot order when both are runni…
Browse files Browse the repository at this point in the history
…ng (#4545)
  • Loading branch information
trevorwhitney authored Oct 26, 2021
1 parent 8eaae6e commit d79a8e0
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions pkg/loki/loki.go
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,18 @@ func (t *Loki) setupModuleManager() error {
deps[All] = append(deps[All], Compactor)
}

// If the query scheduler and querier are running together, make sure the scheduler goes
// first to initialize the ring that will also be used by the querier
if (t.Cfg.isModuleEnabled(Querier) && t.Cfg.isModuleEnabled(QueryScheduler)) || t.Cfg.isModuleEnabled(Read) || t.Cfg.isModuleEnabled(All) {
deps[Querier] = append(deps[Querier], QueryScheduler)
}

// If the query scheduler and query frontend are running together, make sure the scheduler goes
// first to initialize the ring that will also be used by the query frontend
if (t.Cfg.isModuleEnabled(QueryFrontend) && t.Cfg.isModuleEnabled(QueryScheduler)) || t.Cfg.isModuleEnabled(Read) || t.Cfg.isModuleEnabled(All) {
deps[QueryFrontend] = append(deps[QueryFrontend], QueryScheduler)
}

for mod, targets := range deps {
if err := mm.AddDependency(mod, targets...); err != nil {
return err
Expand Down

0 comments on commit d79a8e0

Please sign in to comment.