Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

introduce ephemeral checker service and make distributor service depend on it #3997

Merged
merged 3 commits into from
Jan 18, 2023
Merged

introduce ephemeral checker service and make distributor service depend on it #3997

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
260e7d7
introduce ephemeral checker service and make distributor service depe…
replay Jan 18, 2023
8c7880a
overrides a dependency of ephemeral checker
replay Jan 18, 2023
5c25bbf
make the ephemeral checker module invisible to the user
replay Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/mimir/mimir.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ import (
"github.com/grafana/mimir/pkg/usagestats"
"github.com/grafana/mimir/pkg/util"
"github.com/grafana/mimir/pkg/util/activitytracker"
"github.com/grafana/mimir/pkg/util/ephemeral"
util_log "github.com/grafana/mimir/pkg/util/log"
"github.com/grafana/mimir/pkg/util/noauth"
"github.com/grafana/mimir/pkg/util/process"
Expand Down Expand Up @@ -667,6 +668,7 @@ type Mimir struct {
ActivityTracker *activitytracker.ActivityTracker
UsageStatsReporter *usagestats.Reporter
BuildInfoHandler http.Handler
EphemeralChecker ephemeral.SeriesCheckerByUser

// Queryables that the querier should use to query the long term storage.
StoreQueryables []querier.QueryableWithFilter
Expand Down
11 changes: 9 additions & 2 deletions pkg/mimir/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ const (
ActiveGroupsCleanupService string = "active-groups-cleanup-service"
Distributor string = "distributor"
DistributorService string = "distributor-service"
EphemeralChecker string = "ephemeral-checker"
Ingester string = "ingester"
IngesterService string = "ingester-service"
Flusher string = "flusher"
Expand Down Expand Up @@ -297,7 +298,7 @@ func (t *Mimir) initDistributorService() (serv services.Service, err error) {
// ruler's dependency)
canJoinDistributorsRing := t.Cfg.isAnyModuleEnabled(Distributor, Write, All)

t.Distributor, err = distributor.New(t.Cfg.Distributor, t.Cfg.IngesterClient, t.Overrides, t.ActiveGroupsCleanup, t.Ring, t.Overrides, canJoinDistributorsRing, t.Registerer, util_log.Logger)
t.Distributor, err = distributor.New(t.Cfg.Distributor, t.Cfg.IngesterClient, t.Overrides, t.ActiveGroupsCleanup, t.Ring, t.EphemeralChecker, canJoinDistributorsRing, t.Registerer, util_log.Logger)
if err != nil {
return
}
Expand All @@ -309,6 +310,11 @@ func (t *Mimir) initDistributorService() (serv services.Service, err error) {
return t.Distributor, nil
}

func (t *Mimir) initEphemeralChecker() (serv services.Service, err error) {
t.EphemeralChecker = t.Overrides
return nil, nil
}

func (t *Mimir) initDistributor() (serv services.Service, err error) {
t.API.RegisterDistributor(t.Distributor, t.Cfg.Distributor, t.Registerer)

Expand Down Expand Up @@ -825,6 +831,7 @@ func (t *Mimir) setupModuleManager() error {
mm.RegisterModule(ActiveGroupsCleanupService, t.initActiveGroupsCleanupService, modules.UserInvisibleModule)
mm.RegisterModule(Distributor, t.initDistributor)
mm.RegisterModule(DistributorService, t.initDistributorService, modules.UserInvisibleModule)
mm.RegisterModule(EphemeralChecker, t.initEphemeralChecker)
pstibrany marked this conversation as resolved.
Show resolved Hide resolved
mm.RegisterModule(Ingester, t.initIngester)
mm.RegisterModule(IngesterService, t.initIngesterService, modules.UserInvisibleModule)
mm.RegisterModule(Flusher, t.initFlusher)
Expand Down Expand Up @@ -856,7 +863,7 @@ func (t *Mimir) setupModuleManager() error {
Overrides: {RuntimeConfig},
OverridesExporter: {Overrides, MemberlistKV},
Distributor: {DistributorService, API, ActiveGroupsCleanupService},
DistributorService: {Ring, Overrides},
DistributorService: {Ring, Overrides, EphemeralChecker},
pstibrany marked this conversation as resolved.
Show resolved Hide resolved
Ingester: {IngesterService, API, ActiveGroupsCleanupService},
IngesterService: {Overrides, RuntimeConfig, MemberlistKV},
Flusher: {Overrides, API},
Expand Down