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

[Issue 213] Fix data race when accessing partition producer state #215

Merged
merged 1 commit into from
May 18, 2020
Merged

[Issue 213] Fix data race when accessing partition producer state #215

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
18 changes: 8 additions & 10 deletions pulsar/producer_partition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,16 @@ import (
"github.com/apache/pulsar-client-go/pulsar/internal/pb"
)

type producerState int

const (
producerInit producerState = iota
// producer states
producerInit int32 = iota
producerReady
producerClosing
producerClosed
)

type partitionProducer struct {
state producerState
state int32
client *client
topic string
log *log.Entry
Expand Down Expand Up @@ -107,7 +106,7 @@ func newPartitionProducer(client *client, topic string, options *ProducerOptions

p.log = p.log.WithField("producer_name", p.producerName)
p.log.WithField("cnx", p.cnx.ID()).Info("Created producer")
p.state = producerReady
atomic.StoreInt32(&p.state, producerReady)

go p.runEventsLoop()

Expand Down Expand Up @@ -181,7 +180,7 @@ func (p *partitionProducer) ConnectionClosed() {
func (p *partitionProducer) reconnectToBroker() {
backoff := internal.Backoff{}
for {
if p.state != producerReady {
if atomic.LoadInt32(&p.state) != producerReady {
// Producer is already closing
return
}
Expand Down Expand Up @@ -432,11 +431,10 @@ func (p *partitionProducer) ReceivedSendReceipt(response *pb.CommandSendReceipt)

func (p *partitionProducer) internalClose(req *closeProducer) {
defer req.waitGroup.Done()
if p.state != producerReady {
if !atomic.CompareAndSwapInt32(&p.state, producerReady, producerClosing) {
return
}

p.state = producerClosing
p.log.Info("Closing producer")

id := p.client.rpcClient.NewRequestID()
Expand All @@ -451,7 +449,7 @@ func (p *partitionProducer) internalClose(req *closeProducer) {
p.log.Info("Closed producer")
}

p.state = producerClosed
atomic.StoreInt32(&p.state, producerClosed)
p.cnx.UnregisterListener(p.producerID)
p.batchFlushTicker.Stop()
}
Expand All @@ -472,7 +470,7 @@ func (p *partitionProducer) Flush() error {
}

func (p *partitionProducer) Close() {
if p.state != producerReady {
if atomic.LoadInt32(&p.state) != producerReady {
// Producer is closing
return
}
Expand Down