Skip to content

feat: add per-tenant time sharding for long out-of-order ingestion #14711

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

Merged
merged 5 commits into from
Nov 6, 2024
Merged

feat: add per-tenant time sharding for long out-of-order ingestion #14711

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b70be6
feat: add per-tenant time sharding for long out-of-order ingestion
na-- Nov 1, 2024
ad1c0b2
Fix style issues
na-- Nov 6, 2024
7787735
Add a new time_sharding_ignore_recent option to ignore recent logs
na-- Nov 6, 2024
36e0cfc
Merge branch 'main' into time-sharding
na-- Nov 6, 2024
dfb092a
Fix docs
na-- Nov 6, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into time-sharding
  • Loading branch information
@na--
na-- committed Nov 6, 2024
commit 36e0cfc0848c27a81762c3714856eadaec275693
11 changes: 2 additions & 9 deletions pkg/distributor/distributor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,8 @@ func (d *Distributor) Push(ctx context.Context, req *logproto.PushRequest) (*log

now := time.Now()
validationContext := d.validator.getValidationContextForTime(now, tenantID)
levelDetector := newLevelDetector(validationContext)
shouldDiscoverLevels := levelDetector.shouldDiscoverLogLevels()

shardStreamsCfg := d.validator.Limits.ShardStreams(tenantID)
maybeShardByRate := func(stream logproto.Stream, pushSize int) {
Expand Down Expand Up @@ -717,15 +719,6 @@ func (d *Distributor) trackDiscardedData(
}
}

func hasAnyLevelLabels(l labels.Labels) (string, bool) {
for lbl := range allowedLabelsForLevel {
if l.Has(lbl) {
return l.Get(lbl), true
}
}
return "", false
}

type streamWithTimeShard struct {
logproto.Stream
linesTotalLen int
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.