Skip to content

Commit

Permalink
Cherry-picks for 2.10.16 (#5462)
Browse files Browse the repository at this point in the history
Includes:

- #5460
- #5457
  • Loading branch information
wallyqs authored May 21, 2024
2 parents 9273b3d + 6427a45 commit b918807
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
5 changes: 5 additions & 0 deletions server/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,11 @@ func (s *Server) sendInternalAccountMsgWithReply(a *Account, subject, reply stri
s.mu.RLock()
if s.sys == nil || s.sys.sendq == nil {
s.mu.RUnlock()
if s.isShuttingDown() {
// Skip in case this was called at the end phase during shut down
// to avoid too many entries in the logs.
return nil
}
return ErrNoSysAccount
}
c := s.sys.client
Expand Down
4 changes: 4 additions & 0 deletions server/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -4870,6 +4870,10 @@ func (mset *stream) name() string {

func (mset *stream) internalLoop() {
mset.mu.RLock()
setGoRoutineLabels(pprofLabels{
"account": mset.acc.Name,
"stream": mset.cfg.Name,
})
s := mset.srv
c := s.createInternalJetStreamClient()
c.registerWithAccount(mset.acc)
Expand Down

0 comments on commit b918807

Please sign in to comment.