Skip to content

Fix race condition between server shutdown and consumer info #6356

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

Merged
derekcollison merged 2 commits into from
Jan 9, 2025
+9 −5
Merged

Fix race condition between server shutdown and consumer info #6356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3aedf5
Fix race condition between server shutdown and consumer info
neilalexander Jan 9, 2025
7e92926
Fix race in `TestJetStreamClusterGhostEphemeralsAfterRestart`
neilalexander Jan 9, 2025
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
10 changes: 7 additions & 3 deletions server/jetstream_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4701,10 +4701,14 @@ func (s *Server) jsConsumerInfoRequest(sub *subscription, c *client, _ *Account,
return
}

js.mu.RLock()
meta := cc.meta
js.mu.RUnlock()

// Since these could wait on the Raft group lock, don't do so under the JS lock.
ourID := cc.meta.ID()
groupLeader := cc.meta.GroupLeader()
groupCreated := cc.meta.Created()
ourID := meta.ID()
groupLeader := meta.GroupLeader()
groupCreated := meta.Created()

js.mu.RLock()
isLeader, sa, ca := cc.isLeader(), js.streamAssignment(acc.Name, streamName), js.consumerAssignment(acc.Name, streamName, consumerName)
Expand Down
4 changes: 2 additions & 2 deletions server/jetstream_cluster_3_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,10 +1602,10 @@ func TestJetStreamClusterParallelConsumerCreation(t *testing.T) {
func TestJetStreamClusterGhostEphemeralsAfterRestart(t *testing.T) {
consumerNotActiveStartInterval = time.Second
consumerNotActiveMaxInterval = time.Second
defer func() {
t.Cleanup(func() {
consumerNotActiveStartInterval = defaultConsumerNotActiveStartInterval
consumerNotActiveMaxInterval = defaultConsumerNotActiveMaxInterval
}()
})

c := createJetStreamClusterExplicit(t, "R3S", 3)
defer c.shutdown()
Expand Down