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

Avoid contention on producer mutex on critical path #286

Merged
merged 3 commits into from
Jun 18, 2020
Merged

Avoid contention on producer mutex on critical path #286

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90fec38
Avoid contention on producer mutex on critical path
merlimat Jun 17, 2020
77b3667
Circumvent the race detector
merlimat Jun 18, 2020
edbe469
Removed space
merlimat Jun 18, 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
47 changes: 27 additions & 20 deletions pulsar/producer_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,20 @@ import (
"sync"
"sync/atomic"
"time"
"unsafe"

log "github.com/sirupsen/logrus"

"github.com/apache/pulsar-client-go/pulsar/internal"
)

type producer struct {
sync.Mutex
sync.RWMutex
client *client
options *ProducerOptions
topic string
producers []Producer
producersPtr unsafe.Pointer
numPartitions uint32
messageRouter func(*ProducerMessage, TopicMetadata) int
ticker *time.Ticker
Expand Down Expand Up @@ -115,6 +117,7 @@ func (p *producer) internalCreatePartitionsProducers() error {

p.Lock()
defer p.Unlock()

oldProducers := p.producers

if oldProducers != nil {
Expand Down Expand Up @@ -179,6 +182,7 @@ func (p *producer) internalCreatePartitionsProducers() error {
return err
}

atomic.StorePointer(&p.producersPtr, unsafe.Pointer(&p.producers))
atomic.StoreUint32(&p.numPartitions, uint32(len(p.producers)))
return nil
}
Expand All @@ -188,8 +192,8 @@ func (p *producer) Topic() string {
}

func (p *producer) Name() string {
p.Lock()
defer p.Unlock()
p.RLock()
defer p.RUnlock()

return p.producers[0].Name()
}
Expand All @@ -199,27 +203,30 @@ func (p *producer) NumPartitions() uint32 {
}

func (p *producer) Send(ctx context.Context, msg *ProducerMessage) (MessageID, error) {
p.Lock()
partition := p.messageRouter(msg, p)
pp := p.producers[partition]
p.Unlock()

return pp.Send(ctx, msg)
return p.getPartition(msg).Send(ctx, msg)
}

func (p *producer) SendAsync(ctx context.Context, msg *ProducerMessage,
callback func(MessageID, *ProducerMessage, error)) {
p.Lock()
partition := p.messageRouter(msg, p)
pp := p.producers[partition]
p.Unlock()
p.getPartition(msg).SendAsync(ctx, msg, callback)
}

pp.SendAsync(ctx, msg, callback)
func (p *producer) getPartition(msg *ProducerMessage) Producer {
// Since partitions can only increase, it's ok if the producers list
// is updated in between. The numPartition is updated only after the list.
partition := p.messageRouter(msg, p)
producers := *(*[]Producer)(atomic.LoadPointer(&p.producersPtr))
if partition >= len(producers) {
// We read the old producers list while the count was already
// updated
partition %= len(producers)
}
return producers[partition]
}

func (p *producer) LastSequenceID() int64 {
p.Lock()
defer p.Unlock()
p.RLock()
defer p.RUnlock()

var maxSeq int64 = -1
for _, pp := range p.producers {
Expand All @@ -232,8 +239,8 @@ func (p *producer) LastSequenceID() int64 {
}

func (p *producer) Flush() error {
p.Lock()
defer p.Unlock()
p.RLock()
defer p.RUnlock()

for _, pp := range p.producers {
if err := pp.Flush(); err != nil {
Expand All @@ -245,8 +252,8 @@ func (p *producer) Flush() error {
}

func (p *producer) Close() {
p.Lock()
defer p.Unlock()
p.RLock()
defer p.RUnlock()
if p.ticker != nil {
p.ticker.Stop()
}
Expand Down