Move scheduling maintenance before dequeued, otherwise a handler coul…

…d consume all the time and maintenance to auto abandon never happens.
FoundatioFx · Mar 20, 2024 · a8348a2 · a8348a2
1 parent fb90e45
commit a8348a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Foundatio.TestHarness/Queue/QueueTestBase.cs b/src/Foundatio.TestHarness/Queue/QueueTestBase.cs
@@ -1605,12 +1605,17 @@ await queue.StartWorkingAsync(async (item) =>
                     do
                     {
                         if (stats.Abandoned > 0)
+                        {
+                            _logger.LogTrace("Breaking, queue item was abandoned");
                             break;
+                        }
 
                         stats = await queue.GetQueueStatsAsync();
+                        _logger.LogTrace("Getting updated stats, Abandoned={Abandoned}", stats.Abandoned);
+
+                        await Task.Delay(50, cancellationTokenSource.Token);
                     } while (sw.Elapsed < TimeSpan.FromSeconds(5));
 
-                    _logger.LogDebug("Asserting abandon count is 1, {Actual}", stats.Abandoned);
                     Assert.Equal(1, stats.Abandoned);
                 }
 

diff --git a/src/Foundatio/Queues/InMemoryQueue.cs b/src/Foundatio/Queues/InMemoryQueue.cs
@@ -231,8 +231,8 @@ protected override async Task<IQueueEntry<T>> DequeueImplAsync(CancellationToken
         _logger.LogTrace("Dequeue: Got Item");
 
         await entry.RenewLockAsync();
-        await OnDequeuedAsync(entry).AnyContext();
         ScheduleNextMaintenance(SystemClock.UtcNow.Add(_options.WorkItemTimeout));
+        await OnDequeuedAsync(entry).AnyContext();
 
         return entry;
     }