Suppress flow when queueing background threads

umbraco · Dec 11, 2023 · b5544aa · b5544aa
1 parent cb76554
commit b5544aa
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/src/Umbraco.Infrastructure/Examine/ExamineIndexRebuilder.cs b/src/Umbraco.Infrastructure/Examine/ExamineIndexRebuilder.cs
@@ -66,7 +66,17 @@ public virtual void RebuildIndex(string indexName, TimeSpan? delay = null, bool
             _logger.LogInformation("Starting async background thread for rebuilding index {indexName}.", indexName);
 
             _backgroundTaskQueue.QueueBackgroundWorkItem(
-                cancellationToken => Task.Run(() => RebuildIndex(indexName, delay.Value, cancellationToken)));
+                cancellationToken =>
+                {
+                    // Do not flow AsyncLocal to the child thread
+                    using (ExecutionContext.SuppressFlow())
+                    {
+                        Task.Run(() => RebuildIndex(indexName, delay.Value, cancellationToken));
+
+                        // immediately return so the queue isn't waiting.
+                        return Task.CompletedTask;
+                    }
+                });
         }
         else
         {
@@ -93,12 +103,16 @@ public virtual void RebuildIndexes(bool onlyEmptyIndexes, TimeSpan? delay = null
             _backgroundTaskQueue.QueueBackgroundWorkItem(
                 cancellationToken =>
                 {
-                    // This is a fire/forget task spawned by the background thread queue (which means we
-                    // don't need to worry about ExecutionContext flowing).
-                    Task.Run(() => RebuildIndexes(onlyEmptyIndexes, delay.Value, cancellationToken));
+                    // Do not flow AsyncLocal to the child thread
+                    using (ExecutionContext.SuppressFlow())
+                    {
+                        // This is a fire/forget task spawned by the background thread queue (which means we
+                        // don't need to worry about ExecutionContext flowing).
+                        Task.Run(() => RebuildIndexes(onlyEmptyIndexes, delay.Value, cancellationToken));
 
-                    // immediately return so the queue isn't waiting.
-                    return Task.CompletedTask;
+                        // immediately return so the queue isn't waiting.
+                        return Task.CompletedTask;
+                    }
                 });
         }
         else