MDL-88428 core_cron: Allow exhausted tasks when running all failed

Author: Fragonite

lib/classes/cron.php

@@ -352,6 +352,10 @@ public static function run_adhoc_task(int $taskid): void {
     /**
      * Execute all failed adhoc tasks.
      *
+     * This includes tasks that have exhausted their retry limits.
+     * It is intended for manual intervention from CLI or UI scripts,
+     * matching the behaviour of manually triggering individual failed tasks.
+     *
      * @param string|null  $classname Run only tasks of this class
      */
     public static function run_failed_adhoc_tasks(?string $classname = null): void {
@@ -364,8 +368,6 @@ public static function run_failed_adhoc_tasks(?string $classname = null): void {
             $params['classname'] = \core\task\manager::get_canonical_class_name($classname);
         }
 
-        // Only rerun the failed tasks that allow to be re-tried or have the remaining attempts available.
-        $where .= ' AND (attemptsavailable > 0 OR attemptsavailable IS NULL)';
         $tasks = $DB->get_records_sql("SELECT * from {task_adhoc} WHERE $where", $params);
         foreach ($tasks as $t) {
             self::run_adhoc_task($t->id);

lib/tests/cron_test.php

@@ -154,4 +154,32 @@ public function test_setup_user(): void {
 
         // phpcs:enable
     }
+
+    /**
+     * Test running failed adhoc tasks ignores the attemptsavailable filter.
+     */
+    public function test_run_failed_adhoc_tasks(): void {
+        global $DB;
+        $this->resetAfterTest();
+
+        require_once(__DIR__ . '/fixtures/task_fixtures.php');
+
+        // Create a standard test task.
+        $task = new \core\task\adhoc_test_task();
+        \core\task\manager::queue_adhoc_task($task);
+
+        // Force it into an exhausted, failed state.
+        $DB->set_field('task_adhoc', 'faildelay', 60);
+        $DB->set_field('task_adhoc', 'attemptsavailable', 0);
+
+        $this->assertEquals(1, $DB->count_records('task_adhoc'));
+
+        // Silence the output of the CLI runner.
+        ob_start();
+        cron::run_failed_adhoc_tasks();
+        ob_end_clean();
+
+        // The task should have run and been deleted.
+        $this->assertEquals(0, $DB->count_records('task_adhoc'));
+    }
 }