Skip to content

[FIXED] Fix for data races in stream. #5420

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
May 15, 2024
Merged

[FIXED] Fix for data races in stream. #5420

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
4 changes: 2 additions & 2 deletions server/jetstream_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7679,7 +7679,7 @@ func (mset *stream) processClusteredInboundMsg(subject, reply string, hdr, msg [
s, js, jsa, st, r, tierName, outq, node := mset.srv, mset.js, mset.jsa, mset.cfg.Storage, mset.cfg.Replicas, mset.tier, mset.outq, mset.node
maxMsgSize, lseq := int(mset.cfg.MaxMsgSize), mset.lseq
interestPolicy, discard, maxMsgs, maxBytes := mset.cfg.Retention != LimitsPolicy, mset.cfg.Discard, mset.cfg.MaxMsgs, mset.cfg.MaxBytes
isLeader, isSealed := mset.isLeader(), mset.cfg.Sealed
isLeader, isSealed, compressOK := mset.isLeader(), mset.cfg.Sealed, mset.compressOK
mset.mu.RUnlock()

// This should not happen but possible now that we allow scale up, and scale down where this could trigger.
Expand Down Expand Up @@ -7882,7 +7882,7 @@ func (mset *stream) processClusteredInboundMsg(subject, reply string, hdr, msg [
}
}

esm := encodeStreamMsgAllowCompress(subject, reply, hdr, msg, mset.clseq, time.Now().UnixNano(), mset.compressOK)
esm := encodeStreamMsgAllowCompress(subject, reply, hdr, msg, mset.clseq, time.Now().UnixNano(), compressOK)
var mtKey uint64
if mt != nil {
mtKey = mset.clseq
Expand Down
7 changes: 3 additions & 4 deletions server/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3113,7 +3113,7 @@ func (mset *stream) processAllSourceMsgs() {
for _, im := range ims {
if !mset.processInboundSourceMsg(im.si, im) {
// If we are no longer leader bail.
if !mset.isLeader() {
if !mset.IsLeader() {
cleanUp()
return
}
Expand All @@ -3124,7 +3124,7 @@ func (mset *stream) processAllSourceMsgs() {
msgs.recycle(&ims)
case <-t.C:
// If we are no longer leader bail.
if !mset.isLeader() {
if !mset.IsLeader() {
cleanUp()
return
}
Expand Down Expand Up @@ -3188,15 +3188,14 @@ func (mset *stream) handleFlowControl(m *inMsg) {

// processInboundSourceMsg handles processing other stream messages bound for this stream.
func (mset *stream) processInboundSourceMsg(si *sourceInfo, m *inMsg) bool {
mset.mu.Lock()
// If we are no longer the leader cancel this subscriber.
if !mset.isLeader() {
mset.mu.Lock()
mset.cancelSourceConsumer(si.iname)
mset.mu.Unlock()
return false
}

mset.mu.Lock()
isControl := m.isControlMsg()

// Ignore from old subscriptions.
Expand Down