Merge from master

microsoft · Nov 13, 2021 · 6ae6aaf · 6ae6aaf
2 parents 6e6cab7 + ef0775a
commit 6ae6aaf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/cs/src/core/Epochs/LightEpoch.cs b/cs/src/core/Epochs/LightEpoch.cs
@@ -309,7 +309,7 @@ public void BumpCurrentEpoch(Action onDrain)
         {
             int PriorEpoch = BumpCurrentEpoch() - 1;
 
-            int i = 0, j = 0;
+            int i = 0;
             while (true)
             {
                 if (drainList[i].epoch == int.MaxValue)
@@ -343,11 +343,7 @@ public void BumpCurrentEpoch(Action onDrain)
                 {
                     ProtectAndDrain();
                     i = 0;
-                    if (++j == 500)
-                    {
-                        // Spin until there is a free entry in the drain list
-                        j = 0;
-                    }
+                    Thread.Yield();
                 }
             }
 

diff --git a/cs/test/LogShiftTailStressTest.cs b/cs/test/LogShiftTailStressTest.cs
@@ -20,7 +20,7 @@ internal class LogShiftTailStressTest : FasterLogTestBase
         public void FasterLogShiftTailStressTest()
         {
             // Get an excruciatingly slow storage device to maximize chance of clogging the flush pipeline
-            device = new LocalMemoryDevice(1L << 32, 1 << 30, 2, sector_size: 512, latencyMs: 50, fileName: "stress.log");
+            device = new LocalMemoryDevice(1L << 30, 1 << 30, 2, sector_size: 512, latencyMs: 50, fileName: "stress.log");
             var logSettings = new FasterLogSettings { LogDevice = device, LogChecksum = LogChecksumType.None, LogCommitManager = manager};
             log = new FasterLog(logSettings);