TaskScheduler should handle multi-server environments better

muratcakir · muratcakir · commit 246beb21cf19 · 2016-04-14T23:36:14.000+02:00
diff --git a/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs b/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs
@@ -44,14 +44,14 @@ public ActionResult Sweep()
 			var prevTaskStart = DateTime.UtcNow;
 			var count = 0;
 
-            foreach (var task in pendingTasks)
+            for (var i = 0; i < pendingTasks.Count; i++)
             {
-				var elapsedSincePrevTask = DateTime.UtcNow - prevTaskStart;
-				if (elapsedSincePrevTask >= TimeSpan.FromMinutes(_taskScheduler.SweepIntervalMinutes))
+				var task = pendingTasks[i];
+
+				if (i > 0)
 				{
-					// the previous Task execution in this loop took longer
-					// than the scheduler's sweep interval. Most likely a subsequent
-					// Sweep call executed it already in another HTTP request. 
+					// Maybe a subsequent Sweep call or another machine in a webfarm executed 
+					// successive tasks already.
 					// To be able to determine this, we need to reload the entity from the database.
 					// The TaskExecutor will exit when the task should be in running state then.
 					_services.DbContext.ReloadEntity(task);
