Skip to content

Ensure deleteNotActive stops on JetStream or server shutdown #6351

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
Jan 9, 2025
Merged

Ensure deleteNotActive stops on JetStream or server shutdown #6351

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
16 changes: 15 additions & 1 deletion server/consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1853,6 +1853,13 @@ func (o *consumer) deleteNotActive() {

s, js := o.mset.srv, o.srv.js.Load()
acc, stream, name, isDirect := o.acc.Name, o.stream, o.name, o.cfg.Direct
var qch, cqch chan struct{}
if o.srv != nil {
qch = o.srv.quitCh
}
if o.js != nil {
cqch = o.js.clusterQuitC()
}
o.mu.Unlock()

// Useful for pprof.
Expand Down Expand Up @@ -1891,7 +1898,14 @@ func (o *consumer) deleteNotActive() {
interval := consumerNotActiveStartInterval + jitter
ticker := time.NewTicker(interval)
defer ticker.Stop()
for range ticker.C {
for {
select {
case <-ticker.C:
case <-qch:
return
case <-cqch:
return
}
js.mu.RLock()
if js.shuttingDown {
js.mu.RUnlock()
Expand Down