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

Chore: remove unused clientConfig from ingester #1814

Merged
merged 1 commit into from
May 4, 2022
Merged

Chore: remove unused clientConfig from ingester #1814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions pkg/ingester/ingester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,7 @@ func (cfg *Config) getIgnoreSeriesLimitForMetricNamesMap() map[string]struct{} {
type Ingester struct {
*services.BasicService

cfg Config
clientConfig client.Config
cfg Config

metrics *ingesterMetrics
logger log.Logger
Expand Down Expand Up @@ -263,7 +262,7 @@ func newIngester(cfg Config, limits *validation.Overrides, registerer prometheus
}

// New returns an Ingester that uses Mimir block storage.
func New(cfg Config, clientConfig client.Config, limits *validation.Overrides, registerer prometheus.Registerer, logger log.Logger) (*Ingester, error) {
func New(cfg Config, limits *validation.Overrides, registerer prometheus.Registerer, logger log.Logger) (*Ingester, error) {
defaultInstanceLimits = &cfg.DefaultLimits

if cfg.ingesterClientFactory == nil {
Expand All @@ -274,7 +273,6 @@ func New(cfg Config, clientConfig client.Config, limits *validation.Overrides, r
if err != nil {
return nil, err
}
i.clientConfig = clientConfig
i.ingestionRate = util_math.NewEWMARate(0.2, instanceIngestionRateTickInterval)
i.metrics = newIngesterMetrics(registerer, cfg.ActiveSeriesMetricsEnabled, i.getInstanceLimits, i.ingestionRate, &i.inflightPushRequests)

Expand Down
9 changes: 3 additions & 6 deletions pkg/ingester/ingester_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2863,13 +2863,12 @@ func prepareIngesterWithBlockStorageAndOverrides(t testing.TB, ingesterCfg Confi
}

bucketDir := t.TempDir()
clientCfg := defaultClientTestConfig()

ingesterCfg.BlocksStorageConfig.TSDB.Dir = dataDir
ingesterCfg.BlocksStorageConfig.Bucket.Backend = "filesystem"
ingesterCfg.BlocksStorageConfig.Bucket.Filesystem.Directory = bucketDir

ingester, err := New(ingesterCfg, clientCfg, overrides, registerer, log.NewNopLogger())
ingester, err := New(ingesterCfg, overrides, registerer, log.NewNopLogger())
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -2993,7 +2992,6 @@ func TestIngester_OpenExistingTSDBOnStartup(t *testing.T) {
testName := name
testData := test
t.Run(testName, func(t *testing.T) {
clientCfg := defaultClientTestConfig()
limits := defaultLimitsTestConfig()

overrides, err := validation.NewOverrides(limits, nil)
Expand All @@ -3011,7 +3009,7 @@ func TestIngester_OpenExistingTSDBOnStartup(t *testing.T) {
// setup the tsdbs dir
testData.setup(t, tempDir)

ingester, err := New(ingesterCfg, clientCfg, overrides, nil, log.NewNopLogger())
ingester, err := New(ingesterCfg, overrides, nil, log.NewNopLogger())
require.NoError(t, err)

startErr := services.StartAndAwaitRunning(context.Background(), ingester)
Expand Down Expand Up @@ -4006,7 +4004,6 @@ func TestHeadCompactionOnStartup(t *testing.T) {
require.NoError(t, db.Close())
}

clientCfg := defaultClientTestConfig()
limits := defaultLimitsTestConfig()

overrides, err := validation.NewOverrides(limits, nil)
Expand All @@ -4018,7 +4015,7 @@ func TestHeadCompactionOnStartup(t *testing.T) {
ingesterCfg.BlocksStorageConfig.Bucket.S3.Endpoint = "localhost"
ingesterCfg.BlocksStorageConfig.TSDB.Retention = 2 * 24 * time.Hour // Make sure that no newly created blocks are deleted.

ingester, err := New(ingesterCfg, clientCfg, overrides, nil, log.NewNopLogger())
ingester, err := New(ingesterCfg, overrides, nil, log.NewNopLogger())
require.NoError(t, err)
require.NoError(t, services.StartAndAwaitRunning(context.Background(), ingester))

Expand Down
2 changes: 1 addition & 1 deletion pkg/mimir/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ func (t *Mimir) initIngesterService() (serv services.Service, err error) {
t.Cfg.Ingester.InstanceLimitsFn = ingesterInstanceLimits(t.RuntimeConfig)
t.tsdbIngesterConfig()

t.Ingester, err = ingester.New(t.Cfg.Ingester, t.Cfg.IngesterClient, t.Overrides, prometheus.DefaultRegisterer, util_log.Logger)
t.Ingester, err = ingester.New(t.Cfg.Ingester, t.Overrides, prometheus.DefaultRegisterer, util_log.Logger)
if err != nil {
return
}
Expand Down