Fix race condition when recreating subs

Signed-off-by: Neil Twigg <[email protected]>
nats-io · Jul 30, 2024 · 1d6eaa5 · 1d6eaa5
1 parent c7c6e1c
commit 1d6eaa5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/server/raft.go b/server/raft.go
@@ -553,8 +553,14 @@ func (n *raft) recreateInternalSubsLocked() error {
 	acc := n.s.accountNRGAllowed.Load()
 	if acc {
 		// Check whether the specific account has account NRG enabled.
-		if a, _ := n.s.lookupAccount(n.accName); a != nil && a.js != nil {
-			acc = a.js.accountNRG.Load()
+		if a, _ := n.s.lookupAccount(n.accName); a != nil {
+			a.mu.RLock()
+			ajs := a.js
+			a.mu.RUnlock()
+			// Check whether the specific account has JetStream enabled.
+			if ajs != nil {
+				acc = ajs.accountNRG.Load()
+			}
 		}
 	}
 	if acc {