Skip to content

[FIXED] Hold JS lock when accessing stream assignment #6173

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 1 commit into from
Nov 25, 2024
Merged

[FIXED] Hold JS lock when accessing stream assignment #6173

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions server/jetstream_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3437,19 +3437,23 @@ func (s *Server) jsConsumerUnpinRequest(sub *subscription, c *client, _ *Account
}

// First check if the stream and consumer is there.
js.mu.RLock()
sa := js.streamAssignment(acc.Name, stream)
if sa == nil {
js.mu.RUnlock()
resp.Error = NewJSStreamNotFoundError(Unless(err))
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}

ca, ok := sa.consumers[consumer]
if !ok || ca == nil {
js.mu.RUnlock()
resp.Error = NewJSConsumerNotFoundError()
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
js.mu.RUnlock()

// Then check if we are the leader.
mset, err := acc.lookupStream(stream)
Expand Down Expand Up @@ -4886,21 +4890,25 @@ func (s *Server) jsConsumerPauseRequest(sub *subscription, c *client, _ *Account
consumer := consumerNameFromSubject(subject)

if isClustered {
js.mu.RLock()
sa := js.streamAssignment(acc.Name, stream)
if sa == nil {
js.mu.RUnlock()
resp.Error = NewJSStreamNotFoundError(Unless(err))
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}

ca, ok := sa.consumers[consumer]
if !ok || ca == nil {
js.mu.RUnlock()
resp.Error = NewJSConsumerNotFoundError()
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}

nca := *ca
js.mu.RUnlock()
pauseUTC := req.PauseUntil.UTC()
if !pauseUTC.IsZero() {
nca.Config.PauseUntil = &pauseUTC
Expand Down
3 changes: 2 additions & 1 deletion server/jetstream_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4246,8 +4246,10 @@ func (js *jetStream) processConsumerAssignment(ca *consumerAssignment) {
return
}

js.mu.Lock()
sa := js.streamAssignment(accName, stream)
if sa == nil {
js.mu.Unlock()
s.Debugf("Consumer create failed, could not locate stream '%s > %s'", accName, stream)
return
}
Expand All @@ -4259,7 +4261,6 @@ func (js *jetStream) processConsumerAssignment(ca *consumerAssignment) {
var wasExisting bool

// Check if we have an existing consumer assignment.
js.mu.Lock()
if sa.consumers == nil {
sa.consumers = make(map[string]*consumerAssignment)
} else if oca := sa.consumers[ca.Name]; oca != nil {
Expand Down
2 changes: 2 additions & 0 deletions server/jetstream_cluster_2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2075,11 +2075,13 @@ func TestJetStreamClusterMaxConsumersMultipleConcurrentRequests(t *testing.T) {

metaLeader := c.leader()
mjs := metaLeader.getJetStream()
mjs.mu.RLock()
sa := mjs.streamAssignment(globalAccountName, "MAXCC")
require_NotNil(t, sa)
for _, ca := range sa.consumers {
require_False(t, ca.pending)
}
mjs.mu.RUnlock()
}

func TestJetStreamClusterAccountMaxStreamsAndConsumersMultipleConcurrentRequests(t *testing.T) {
Expand Down