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

Lock the correct lock on wal replay #590

Merged
merged 1 commit into from
Mar 13, 2021
Merged

Lock the correct lock on wal replay #590

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
4 changes: 2 additions & 2 deletions modules/ingester/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ func (i *instance) Push(ctx context.Context, req *tempopb.PushRequest) error {

// PushBytes is used by the wal replay code and so it can push directly into the head block with 0 shenanigans
func (i *instance) PushBytes(ctx context.Context, id []byte, object []byte) error {
i.tracesMtx.Lock()
defer i.tracesMtx.Unlock()
i.blocksMtx.Lock()
defer i.blocksMtx.Unlock()

return i.headBlock.Write(id, object)
}
Expand Down