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

userTSDB: Avoid race condition when setting db #9708

Merged
merged 3 commits into from
Oct 28, 2024
Merged

userTSDB: Avoid race condition when setting db #9708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4e0267
userTSDB: Avoid race condition when setting db
aknuds1 Oct 22, 2024
1d84ecd
Merge remote-tracking branch 'origin/main' into arve/user-tsdb-race
aknuds1 Oct 28, 2024
3862596
Make blocksToDelete synchronization local to Ingester.createTSDB
aknuds1 Oct 28, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
* [BUGFIX] Fix issue where active series requests error when encountering a stale posting. #9580
* [BUGFIX] Fix pooling buffer reuse logic when `-distributor.max-request-pool-buffer-size` is set. #9666
* [BUGFIX] Fix issue when using the experimental `-ruler.max-independent-rule-evaluation-concurrency` feature, where the ruler could panic as it updates a running ruleset or shutdowns. #9726
* [BUGFIX] Ingester: Fix race condition in per-tenant TSDB creation. #9708

### Mixin

Expand Down
12 changes: 11 additions & 1 deletion pkg/ingester/ingester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/grafana/dskit/ring"
"github.com/grafana/dskit/services"
"github.com/grafana/dskit/tenant"
"github.com/oklog/ulid"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
Expand Down Expand Up @@ -2666,6 +2667,14 @@ func (i *Ingester) createTSDB(userID string, walReplayConcurrency int) (*userTSD
}
userDB.triggerRecomputeOwnedSeries(recomputeOwnedSeriesReasonNewUser)

userDBHasDB := atomic.NewBool(false)
blocksToDelete := func(blocks []*tsdb.Block) map[ulid.ULID]struct{} {
if !userDBHasDB.Load() {
return nil
}
return userDB.blocksToDelete(blocks)
}

oooTW := i.limits.OutOfOrderTimeWindow(userID)
// Create a new user database
db, err := tsdb.Open(udir, userLogger, tsdbPromReg, &tsdb.Options{
Expand All @@ -2680,7 +2689,7 @@ func (i *Ingester) createTSDB(userID string, walReplayConcurrency int) (*userTSD
WALSegmentSize: i.cfg.BlocksStorageConfig.TSDB.WALSegmentSizeBytes,
WALReplayConcurrency: walReplayConcurrency,
SeriesLifecycleCallback: userDB,
BlocksToDelete: userDB.blocksToDelete,
BlocksToDelete: blocksToDelete,
EnableExemplarStorage: true, // enable for everyone so we can raise the limit later
MaxExemplars: int64(i.limiter.maxExemplarsPerUser(userID)),
SeriesHashCache: i.seriesHashCache,
Expand Down Expand Up @@ -2721,6 +2730,7 @@ func (i *Ingester) createTSDB(userID string, walReplayConcurrency int) (*userTSD
}

userDB.db = db
userDBHasDB.Store(true)
// We set the limiter here because we don't want to limit
// series during WAL replay.
userDB.limiter = i.limiter
Expand Down
Loading