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

Fixes ingester stats. #3350

Merged
merged 1 commit into from
Feb 18, 2021
Merged

Fixes ingester stats. #3350

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 @@ -115,7 +115,6 @@ func (cfg *Config) Validate() error {
return errors.New("the use of the write ahead log (WAL) is incompatible with chunk transfers. It's suggested to use the WAL. Please try setting ingester.max-transfer-retries to 0 to disable transfers")
}
return nil

}

// Ingester builds chunks for incoming log streams.
Expand Down Expand Up @@ -219,7 +218,6 @@ func New(cfg Config, clientConfig client.Config, store ChunkStore, limits *valid
}

func (i *Ingester) starting(ctx context.Context) error {

if i.cfg.WAL.Enabled {
// Ignore retain period during wal replay.
old := i.cfg.RetainPeriod
Expand Down Expand Up @@ -447,7 +445,7 @@ func (i *Ingester) Query(req *logproto.QueryRequest, queryServer logproto.Querie

defer helpers.LogErrorWithContext(ctx, "closing iterator", heapItr.Close)

return sendBatches(queryServer.Context(), heapItr, queryServer, req.Limit)
return sendBatches(ctx, heapItr, queryServer, req.Limit)
}

// QuerySample the ingesters for series from logs matching a set of matchers.
Expand Down Expand Up @@ -486,7 +484,7 @@ func (i *Ingester) QuerySample(req *logproto.SampleQueryRequest, queryServer log

defer helpers.LogErrorWithContext(ctx, "closing iterator", heapItr.Close)

return sendSampleBatches(queryServer.Context(), heapItr, queryServer)
return sendSampleBatches(ctx, heapItr, queryServer)
}

// boltdbShipperMaxLookBack returns a max look back period only if active index type is boltdb-shipper.
Expand Down