shutdown concurrency issue

danielgerlag · Aug 8, 2020 · 2127e6f · 2127e6f
1 parent ffca3da
commit 2127e6f
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/src/WorkflowCore/Services/BackgroundTasks/QueueConsumer.cs b/src/WorkflowCore/Services/BackgroundTasks/QueueConsumer.cs
@@ -61,7 +61,12 @@ private async void Execute()
             {
                 try
                 {
-                    if (activeTasks.Count >= MaxConcurrentItems)
+                    var activeCount = 0;
+                    lock (activeTasks)
+                    {
+                        activeCount = activeTasks.Count;
+                    }
+                    if (activeCount >= MaxConcurrentItems)
                     {
                         await Task.Delay(Options.IdleTime);
                         continue;
@@ -75,14 +80,19 @@ private async void Execute()
                             await Task.Delay(Options.IdleTime, cancelToken);
                         continue;
                     }
-
-                    if (activeTasks.ContainsKey(item))
+
+                    var hasTask = false;
+                    lock (activeTasks)
+                    {
+                        hasTask = activeTasks.ContainsKey(item);
+                    }
+                    if (hasTask)
                     {
                         secondPasses.Add(item);
                         if (!EnableSecondPasses)
                             await QueueProvider.QueueWork(item, Queue);
                         continue;
-                    }
+                    }                   
 
                     secondPasses.TryRemove(item);
 
@@ -121,7 +131,13 @@ private async void Execute()
                 }
             }
 
-            foreach (var task in activeTasks.Values)
+            List<Task> toComplete;
+            lock (activeTasks)
+            {
+                toComplete = activeTasks.Values.ToList();
+            }
+
+            foreach (var task in toComplete)
                 task.Wait();
         }