Skip to content

Commit 167b468

Browse files
authored
fix: Fix nil pointer dereference in bloomstore initialisation (#12869)
The bloom store initialisation updates the shipper configuration which in turn requires the index gateway ring to be initialised in case `-index-gateway.mode` is set to `ring`. Therefore the `BloomStore` module needs to depend on the `IndexGatewayRing` module. Fixes #12270 Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
1 parent 297f619 commit 167b468

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

‎pkg/loki/loki.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,13 +646,13 @@ func (t *Loki) setupModuleManager() error {
646646
mm.RegisterModule(RuleEvaluator, t.initRuleEvaluator, modules.UserInvisibleModule)
647647
mm.RegisterModule(TableManager, t.initTableManager)
648648
mm.RegisterModule(Compactor, t.initCompactor)
649-
mm.RegisterModule(BloomStore, t.initBloomStore)
649+
mm.RegisterModule(BloomStore, t.initBloomStore, modules.UserInvisibleModule)
650650
mm.RegisterModule(BloomCompactor, t.initBloomCompactor)
651651
mm.RegisterModule(BloomCompactorRing, t.initBloomCompactorRing, modules.UserInvisibleModule)
652+
mm.RegisterModule(BloomGateway, t.initBloomGateway)
652653
mm.RegisterModule(IndexGateway, t.initIndexGateway)
653654
mm.RegisterModule(IndexGatewayRing, t.initIndexGatewayRing, modules.UserInvisibleModule)
654655
mm.RegisterModule(IndexGatewayInterceptors, t.initIndexGatewayInterceptors, modules.UserInvisibleModule)
655-
mm.RegisterModule(BloomGateway, t.initBloomGateway)
656656
mm.RegisterModule(QueryScheduler, t.initQueryScheduler)
657657
mm.RegisterModule(QuerySchedulerRing, t.initQuerySchedulerRing, modules.UserInvisibleModule)
658658
mm.RegisterModule(Analytics, t.initAnalytics)
@@ -686,6 +686,7 @@ func (t *Loki) setupModuleManager() error {
686686
IndexGateway: {Server, Store, IndexGatewayRing, IndexGatewayInterceptors, Analytics},
687687
BloomGateway: {Server, BloomStore, Analytics},
688688
BloomCompactor: {Server, BloomStore, BloomCompactorRing, Analytics, Store},
689+
BloomStore: {IndexGatewayRing},
689690
PatternIngester: {Server, MemberlistKV, Analytics},
690691
PatternRingClient: {Server, MemberlistKV, Analytics},
691692
IngesterQuerier: {Ring},

0 commit comments

Comments
 (0)