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

Avoid panic when reloading during LDM #5012

Merged
merged 1 commit into from
Jan 29, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion server/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -1625,7 +1625,6 @@ func (s *Server) shutdownEventing() {
// internal send loop to exit.
s.sendShutdownEvent()
wg.Wait()
close(rc)

s.mu.Lock()
defer s.mu.Unlock()
Expand All @@ -1637,6 +1636,9 @@ func (s *Server) shutdownEventing() {
})
// Turn everything off here.
s.sys = nil
// Make sure this is done after s.sys = nil, so that we don't
// get sends to closed channels on badly-timed config reloads.
close(rc)
}

// Request for our local connection count.
Expand Down