From dee5229f9b9fb7fe792dca5cc66f673f3eaece37 Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Thu, 6 Apr 2023 10:37:31 -0700 Subject: [PATCH 1/2] Fix data race Signed-off-by: Derek Collison --- server/jetstream_api.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/jetstream_api.go b/server/jetstream_api.go index cfe06442..7a7ce2c1 100644 --- a/server/jetstream_api.go +++ b/server/jetstream_api.go @@ -890,10 +890,17 @@ func (s *Server) sendAPIErrResponse(ci *ClientInfo, acc *Account, subject, reply const errRespDelay = 500 * time.Millisecond func (s *Server) sendDelayedAPIErrResponse(ci *ClientInfo, acc *Account, subject, reply, request, response string, rg *raftGroup) { + js := s.getJetStream() + if js == nil { + return + } var quitCh <-chan struct{} + js.mu.RLock() if rg != nil && rg.node != nil { quitCh = rg.node.QuitC() } + js.mu.RUnlock() + s.startGoRoutine(func() { defer s.grWG.Done() select { From a60f6238424843ddf544ed493cc2d1cde9e84ab3 Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Thu, 6 Apr 2023 10:39:30 -0700 Subject: [PATCH 2/2] Fix flapping test since claims not processed inline now Signed-off-by: Derek Collison --- server/events_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/server/events_test.go b/server/events_test.go index 28bc4c9c..1c416570 100644 --- a/server/events_test.go +++ b/server/events_test.go @@ -1515,6 +1515,7 @@ func TestAccountClaimsUpdatesWithServiceImports(t *testing.T) { nc.Publish(claimUpdateSubj, []byte(ajwt2)) } nc.Flush() + time.Sleep(50 * time.Millisecond) if startSubs < s.NumSubscriptions() { t.Fatalf("Subscriptions leaked: %d vs %d", startSubs, s.NumSubscriptions())