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

Add before you push to the queue to prevent race condition on size #2044

Merged
merged 2 commits into from
Jan 28, 2020
Merged

Add before you push to the queue to prevent race condition on size #2044

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aaa413
Increment size before putting in the queue
joe-elliott Jan 27, 2020
332fd88
Merge branch 'master' into fix-queue-race-condition
jpkrohling Jan 28, 2020
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
3 changes: 2 additions & 1 deletion pkg/queue/bounded_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,13 @@ func (q *BoundedQueue) Produce(item interface{}) bool {
return false
}

q.size.Add(1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually looks like a real bug, we are subtracting in both code branches, but adding in only one. Good catch!

select {
case *q.items <- item:
q.size.Add(1)
return true
default:
// should not happen, as overflows should have been captured earlier
q.size.Sub(1)
if q.onDroppedItem != nil {
q.onDroppedItem(item)
}
Expand Down