Skip to content

[FIXED] Mirror consumer data race #7716

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
neilalexander merged 1 commit into from
Jan 12, 2026
Merged

[FIXED] Mirror consumer data race #7716

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
12 changes: 10 additions & 2 deletions server/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3149,7 +3149,6 @@ func (mset *stream) setupMirrorConsumer() error {
}

mirror := mset.mirror
mirrorWg := &mirror.wg

// We want to throttle here in terms of how fast we request new consumers,
// or if the previous is still in progress.
Expand Down Expand Up @@ -3308,7 +3307,16 @@ func (mset *stream) setupMirrorConsumer() error {

// Wait for previous processMirrorMsgs go routine to be completely done.
// If none is running, this will not block.
mirrorWg.Wait()
mset.mu.Lock()
if mset.mirror == nil {
// Mirror config has been removed.
mset.mu.Unlock()
return
} else {
wg := &mset.mirror.wg
mset.mu.Unlock()
wg.Wait()
}

select {
case ccr := <-respCh:
Expand Down