Ensure deleteNotActive stops on JetStream or server shutdown#6351
Merged
derekcollison merged 1 commit intomainfrom Jan 9, 2025
Merged
Ensure deleteNotActive stops on JetStream or server shutdown#6351derekcollison merged 1 commit intomainfrom
deleteNotActive stops on JetStream or server shutdown#6351derekcollison merged 1 commit intomainfrom
Conversation
wallyqs
reviewed
Jan 9, 2025
server/consumer.go
Outdated
| case <-ticker.C: | ||
| case <-o.js.clusterQuitC(): | ||
| return | ||
| case <-o.srv.quitCh: |
Member
There was a problem hiding this comment.
could o.srv or o.js be nil here while attempting the shutdown?
Member
Author
There was a problem hiding this comment.
As best as I can tell, neither o.srv or o.js can go back to being nil, but I can add extra guards just to be sure.
This ensures that we stop these goroutines more quickly when either the server or the JetStream system shuts down. This also avoids a race in `TestJetStreamClusterGhostEphemeralsAfterRestart`, as the unit test was reverting a modified constant before these goroutines would have finished in some cases. Signed-off-by: Neil Twigg <neil@nats.io>
neilalexander
force-pushed
the
neil/deletenotactive2
branch
from
2467cf8 to
7828bd4
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This ensures that we stop these goroutines more quickly when either the server or the JetStream system shuts down.
This also avoids a race in
TestJetStreamClusterGhostEphemeralsAfterRestart, as the unit test was reverting a modified constant before these goroutines would have finished in some cases.Signed-off-by: Neil Twigg neil@nats.io