Only load msgs if mb.fss has been evicted.

Signed-off-by: Derek Collison <[email protected]>
nats-io · Oct 27, 2023 · 85784a3 · 85784a3
1 parent c999177
commit 85784a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/filestore.go b/server/filestore.go
@@ -2426,7 +2426,7 @@ func (fs *fileStore) SubjectsState(subject string) map[string]SimpleState {
 	fs.mu.RLock()
 	defer fs.mu.RUnlock()
 
-	if fs.state.Msgs == 0 {
+	if fs.state.Msgs == 0 || fs.noTrackSubjects() {
 		return nil
 	}
 
@@ -2454,7 +2454,7 @@ func (fs *fileStore) SubjectsState(subject string) map[string]SimpleState {
 
 		mb.mu.Lock()
 		var shouldExpire bool
-		if mb.cacheNotLoaded() {
+		if mb.fss == nil {
 			// Make sure we have fss loaded.
 			mb.loadMsgsWithLock()
 			shouldExpire = true