bugfix

microsoft · Mar 8, 2025 · cb29622 · cb29622
1 parent 84f397e
commit cb29622
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/libs/server/GarnetDatabase.cs b/libs/server/GarnetDatabase.cs
@@ -140,8 +140,12 @@ public void Dispose()
 
             if (ObjectStoreSizeTracker != null)
             {
-                while (!ObjectStoreSizeTracker.Stopped)
-                    Thread.Yield();
+                // If tracker has previously started, wait for it to stop
+                if (!ObjectStoreSizeTracker.TryPreventStart())
+                {
+                    while (!ObjectStoreSizeTracker.Stopped)
+                        Thread.Yield();
+                }
             }
 
             disposed = true;

diff --git a/libs/server/Storage/SizeTracker/CacheSizeTracker.cs b/libs/server/Storage/SizeTracker/CacheSizeTracker.cs
@@ -27,7 +27,7 @@ public class CacheSizeTracker
 
         int isStarted = 0;
         private const int deltaFraction = 10; // 10% of target size
-        private TsavoriteKV<byte[], IGarnetObject, ObjectStoreFunctions, ObjectStoreAllocator> store;
+        TsavoriteKV<byte[], IGarnetObject, ObjectStoreFunctions, ObjectStoreAllocator> store;
 
         internal bool Stopped => (mainLogTracker == null || mainLogTracker.Stopped) && (readCacheTracker == null || readCacheTracker.Stopped);
 
@@ -118,5 +118,15 @@ public void AddReadCacheTrackedSize(long size)
             // just for the main log
             this.readCacheTracker?.IncrementSize(size);
         }
+
+        /// <summary>
+        /// If tracker has not started, prevent it from starting
+        /// </summary>
+        /// <returns>True if tracker hasn't previously started</returns>
+        public bool TryPreventStart()
+        {
+            var prevStarted = Interlocked.CompareExchange(ref isStarted, 1, 0);
+            return prevStarted == 0;
+        }
     }
 }