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

producer: make Flush.Frequency behaviour better #389

Merged
merged 2 commits into from
Mar 24, 2015
Merged

producer: make Flush.Frequency behaviour better #389

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f86d40d
producer: make Flush.Frequency behaviour better
eapache Mar 24, 2015
509eef3
Rename some things
eapache Mar 24, 2015
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
45 changes: 21 additions & 24 deletions async_producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,24 +421,20 @@ func (p *asyncProducer) leaderDispatcher(topic string, partition int32, input ch
// groups messages together into appropriately-sized batches for sending to the broker
// based on https://godoc.org/github.com/eapache/channels#BatchingChannel
func (p *asyncProducer) messageAggregator(broker *Broker, input chan *ProducerMessage) {
var ticker *time.Ticker
var timer <-chan time.Time
if p.conf.Producer.Flush.Frequency > 0 {
ticker = time.NewTicker(p.conf.Producer.Flush.Frequency)
timer = ticker.C
}

var buffer []*ProducerMessage
var doFlush chan []*ProducerMessage
var bytesAccumulated int
var defaultFlush bool
var (
timer <-chan time.Time
buffer []*ProducerMessage
flushTriggered chan []*ProducerMessage
bytesAccumulated int
defaultFlush bool
)

if p.conf.Producer.Flush.Frequency == 0 && p.conf.Producer.Flush.Bytes == 0 && p.conf.Producer.Flush.Messages == 0 {
defaultFlush = true
}

flusher := make(chan []*ProducerMessage)
go withRecover(func() { p.flusher(broker, flusher) })
output := make(chan []*ProducerMessage)
go withRecover(func() { p.flusher(broker, output) })

for {
select {
Expand All @@ -451,9 +447,10 @@ func (p *asyncProducer) messageAggregator(broker *Broker, input chan *ProducerMe
(p.conf.Producer.Compression != CompressionNone && bytesAccumulated+msg.byteSize() >= p.conf.Producer.MaxMessageBytes) ||
(p.conf.Producer.Flush.MaxMessages > 0 && len(buffer) >= p.conf.Producer.Flush.MaxMessages) {
Logger.Println("producer/aggregator maximum request accumulated, forcing blocking flush")
flusher <- buffer
output <- buffer
timer = nil
buffer = nil
doFlush = nil
flushTriggered = nil
bytesAccumulated = 0
}

Expand All @@ -464,25 +461,25 @@ func (p *asyncProducer) messageAggregator(broker *Broker, input chan *ProducerMe
msg.flags&chaser == chaser ||
(p.conf.Producer.Flush.Messages > 0 && len(buffer) >= p.conf.Producer.Flush.Messages) ||
(p.conf.Producer.Flush.Bytes > 0 && bytesAccumulated >= p.conf.Producer.Flush.Bytes) {
doFlush = flusher
flushTriggered = output
} else if p.conf.Producer.Flush.Frequency > 0 && timer == nil {
timer = time.After(p.conf.Producer.Flush.Frequency)
}
case <-timer:
doFlush = flusher
case doFlush <- buffer:
flushTriggered = output
case flushTriggered <- buffer:
timer = nil
buffer = nil
doFlush = nil
flushTriggered = nil
bytesAccumulated = 0
}
}

shutdown:
if ticker != nil {
ticker.Stop()
}
if len(buffer) > 0 {
flusher <- buffer
output <- buffer
}
close(flusher)
close(output)
}

// one per broker
Expand Down