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

try fixing a PartitionConsumer's race condition #1156

Merged
merged 2 commits into from
Mar 13, 2019
Merged

try fixing a PartitionConsumer's race condition #1156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58a9d32
dont't drain PartitionConsumer's messages channel when closing
imjustfly Aug 23, 2018
dcc4684
optimized compatibility
imjustfly Aug 23, 2018
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
16 changes: 9 additions & 7 deletions consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,6 @@ func (child *partitionConsumer) AsyncClose() {
func (child *partitionConsumer) Close() error {
child.AsyncClose()

go withRecover(func() {
for range child.messages {
// drain
}
})

var errors ConsumerErrors
for err := range child.errors {
errors = append(errors, err)
Expand Down Expand Up @@ -454,14 +448,22 @@ feederLoop:
for i, msg := range msgs {
messageSelect:
select {
case <-child.dying:
child.broker.acks.Done()
continue feederLoop
case child.messages <- msg:
firstAttempt = true
case <-expiryTicker.C:
if !firstAttempt {
child.responseResult = errTimedOut
child.broker.acks.Done()
remainingLoop:
for _, msg = range msgs[i:] {
child.messages <- msg
select {
case child.messages <- msg:
case <-child.dying:
break remainingLoop
}
}
child.broker.input <- child
continue feederLoop
Expand Down