MDL-81689 tests: Check task DB record for nextruntime

mickhawkins · Jul 18, 2024 · 0d50449 · 0d50449
1 parent 615b78a
commit 0d50449
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/classes/task/manager.php b/lib/classes/task/manager.php
@@ -807,8 +807,11 @@ function ($a, $b) use ($ordering) {
 
             if ($lock = $cronlockfactory->get_lock('adhoc_' . $record->id, 0)) {
 
-                // Safety check, see if the task has been already processed by another cron run.
-                $record = $DB->get_record('task_adhoc', array('id' => $record->id));
+                // Safety check, see if the task has already been processed by another cron run (or attempted and failed).
+                // If another cron run attempted to process the task and failed, nextruntime will be in the future.
+                $record = $DB->get_record_select('task_adhoc',
+                    "id = :id AND nextruntime < :timestart",
+                    ['id' => $record->id, 'timestart' => $timestart]);
                 if (!$record) {
                     $lock->release();
                     unset(self::$miniqueue[$taskid]);