From eecb8af9972cbe1323541cc12cdfc651664a4234 Mon Sep 17 00:00:00 2001 From: Waldemar Quevedo Date: Fri, 4 Aug 2023 16:57:39 -0700 Subject: [PATCH] Remove reload fix from main This workaround will not work for v2.10 branch features Signed-off-by: Waldemar Quevedo --- server/reload_test.go | 2 ++ server/server.go | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/reload_test.go b/server/reload_test.go index 9f0410c7..e2f85d36 100644 --- a/server/reload_test.go +++ b/server/reload_test.go @@ -2509,6 +2509,7 @@ func TestConfigReloadClusterPermsOldServer(t *testing.T) { } func TestConfigReloadAccountUsers(t *testing.T) { + t.Skip("fix for this needs to be revisited for v2.10 release") conf := createConfFile(t, []byte(` listen: "127.0.0.1:-1" accounts { @@ -2726,6 +2727,7 @@ func TestConfigReloadAccountUsers(t *testing.T) { } func TestConfigReloadAccountWithNoChanges(t *testing.T) { + t.Skip("fix for this needs to be revisited for v2.10 release") conf := createConfFile(t, []byte(` listen: "127.0.0.1:-1" system_account: sys diff --git a/server/server.go b/server/server.go index 2b2f03a8..fcda8bae 100644 --- a/server/server.go +++ b/server/server.go @@ -1202,9 +1202,6 @@ func (s *Server) configureAccounts(reloading bool) (map[string]struct{}, error) c.processUnsub(sid) } acc.addAllServiceImportSubs() - s.mu.Unlock() - s.registerSystemImports(acc) - s.mu.Lock() } // Set the system account if it was configured.