Fix panic when stopping the nats #10363
Merged
+14
−3
Conversation
This file contains 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
rhafer
suggested changes
Oct 22, 2024
| @@ -44,6 +45,8 @@ func (n *NATSServer) ListenAndServe() (err error) { | |||
| return nil | |||
| } | |||
|
|
|||
| // Shutdown stops the NATSServer gracefully | |||
| // The NATS server itself runs the signal handling. Set `natsOpts.NoSigs = true` if you want to handle signals ourselves | |||
There was a problem hiding this comment.
I think we should use the natsOpts.NoSigs = true option. The nats signal handler calls os.Exit() which might cause an unclean shutdown for the rest of ocis when running as a single binary.
I guess you'll have to add a n.server.WaitForShutdown() call below as well then.
2403905
force-pushed
the
issue-10360
branch
2 times, most recently
from
60a3578 to
c1b9c72
Compare
rhafer
suggested changes
Oct 22, 2024
| @@ -44,6 +47,7 @@ func (n *NATSServer) ListenAndServe() (err error) { | |||
| return nil | |||
| } | |||
|
|
|||
| // Shutdown stops the NATSServer gracefully | |||
| func (n *NATSServer) Shutdown() { | |||
| n.server.Shutdown() | |||
There was a problem hiding this comment.
I think you should add
n.server.WaitForShutdown()
here. (Similar to what the signal handler in nats does)
|
rhafer
approved these changes
Oct 22, 2024
ownclouders
pushed a commit
that referenced
this pull request
Oct 22, 2024
Fix panic when stopping the nats
14 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Related Issue
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: