Skip to content

Small optimisations to Ingester.append() #1654

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 2 commits into from
Sep 7, 2019
Merged

Small optimisations to Ingester.append() #1654

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acddff8
Protect two data structures with one lock, for performance
bboreham Aug 31, 2019
f54a9c0
Combine two defers into one, for performance
bboreham Aug 31, 2019
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
33 changes: 18 additions & 15 deletions pkg/ingester/ingester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,12 @@ type Ingester struct {
lifecycler *ring.Lifecycler
limits *validation.Overrides

stopLock sync.RWMutex
stopped bool
quit chan struct{}
done sync.WaitGroup
quit chan struct{}
done sync.WaitGroup

userStatesMtx sync.RWMutex
userStatesMtx sync.RWMutex // protects userStates and stopped
userStates *userStates
stopped bool // protected by userStatesMtx

// One queue per flush thread. Fingerprint is used to
// pick a queue.
Expand Down Expand Up @@ -247,8 +246,8 @@ func (i *Ingester) Shutdown() {

// StopIncomingRequests is called during the shutdown process.
func (i *Ingester) StopIncomingRequests() {
i.stopLock.Lock()
defer i.stopLock.Unlock()
i.userStatesMtx.Lock()
defer i.userStatesMtx.Unlock()
i.stopped = true
}

Expand Down Expand Up @@ -286,21 +285,25 @@ func (i *Ingester) Push(ctx old_ctx.Context, req *client.WriteRequest) (*client.
func (i *Ingester) append(ctx context.Context, userID string, labels labelPairs, timestamp model.Time, value model.SampleValue, source client.WriteRequest_SourceEnum) error {
labels.removeBlanks()

i.stopLock.RLock()
defer i.stopLock.RUnlock()
var (
state *userState
fp model.Fingerprint
)
i.userStatesMtx.RLock()
defer func() {
i.userStatesMtx.RUnlock()
if state != nil {
state.fpLocker.Unlock(fp)
}
}()
if i.stopped {
return fmt.Errorf("ingester stopping")
}

i.userStatesMtx.RLock()
defer i.userStatesMtx.RUnlock()
state, fp, series, err := i.userStates.getOrCreateSeries(ctx, userID, labels)
if err != nil {
state = nil // don't want to unlock the fp if there is an error
return err
}
defer func() {
state.fpLocker.Unlock(fp)
}()

prevNumChunks := len(series.chunkDescs)
if i.cfg.SpreadFlushes && prevNumChunks > 0 {
Expand Down