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.

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

Fix a blocking subscriber prevents other subscribers from receiving a message #256

Merged
merged 2 commits into from
Jan 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion pubsub/gochannel/pubsub.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,19 @@ func (g *GoChannel) sendMessage(topic string, message *message.Message) (<-chan
}

go func(subscribers []*subscriber) {
wg := &sync.WaitGroup{}

for i := range subscribers {
subscriber := subscribers[i]
subscriber.sendMessageToSubscriber(message, logFields)

wg.Add(1)
go func() {
subscriber.sendMessageToSubscriber(message, logFields)
wg.Done()
}()
}

wg.Wait()
close(ackedBySubscribers)
}(subscribers)

Expand Down
38 changes: 38 additions & 0 deletions pubsub/gochannel/pubsub_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,44 @@ func TestPublish_race_condition_when_closing(t *testing.T) {
}
}

func TestPublishSubscribe_do_not_block_other_subscribers(t *testing.T) {
pubSub := gochannel.NewGoChannel(
gochannel.Config{},
watermill.NewStdLogger(true, true),
)
topicName := "test_topic_" + watermill.NewUUID()

msgsFromSubscriber1, err := pubSub.Subscribe(context.Background(), topicName)
require.NoError(t, err)

_, err = pubSub.Subscribe(context.Background(), topicName)
require.NoError(t, err)

msgsFromSubscriber3, err := pubSub.Subscribe(context.Background(), topicName)
require.NoError(t, err)

err = pubSub.Publish(topicName, message.NewMessage("1", nil))
require.NoError(t, err)

received := make(chan struct{})
go func() {
msg := <-msgsFromSubscriber1
msg.Ack()

msg = <-msgsFromSubscriber3
msg.Ack()

close(received)
}()

select {
case <-received:
// ok
case <-time.After(5 * time.Second):
t.Fatal("subscriber which didn't ack a message blocked other subscribers from receiving it")
}
}

func testPublishSubscribeSubRace(t *testing.T) {
t.Helper()

Expand Down