Skip to content
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.

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

Ensure deleteNotActive stops on JetStream or server shutdown #6351

Merged
merged 1 commit into from
Jan 9, 2025

Conversation

neilalexander
Copy link
Member

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 [email protected]

@neilalexander neilalexander requested a review from a team as a code owner January 9, 2025 10:30
case <-ticker.C:
case <-o.js.clusterQuitC():
return
case <-o.srv.quitCh:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could o.srv or o.js be nil here while attempting the shutdown?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 <[email protected]>
@neilalexander neilalexander force-pushed the neil/deletenotactive2 branch from 2467cf8 to 7828bd4 Compare January 9, 2025 13:24
Copy link
Member

@derekcollison derekcollison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@derekcollison derekcollison merged commit bcfafd3 into main Jan 9, 2025
5 checks passed
@derekcollison derekcollison deleted the neil/deletenotactive2 branch January 9, 2025 13:51
wallyqs added a commit that referenced this pull request Jan 9, 2025
#### Dependencies
- #6323
- #6324

####  Leafnode
- #6291

#### JetStream
- #6226
- #6235
- #6277
- #6279
- #6283
- #6289
- #6316
- #6317
- #6325
- #6326
- #6335
- #6338
- #6341
- #6344
- #6150
- #6351
- #6355

#### Tests
- #6278
- #6297
- #6300
- #6343
- #6329
- #6330
- #6331
- #6332
- #6334
- #6356
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants