Merge pull request #17058 from craftcms/bugfix/batched-jobs-and-ttr

don't push new job for each item if `ttr` is `null`

Author: brandonkelly

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Fixed an error that could occur when changing a field’s type. ([#17045](https://github.com/craftcms/cms/issues/17045))
 - Fixed a bug where field settings weren’t being retained when changing a field’s type to a preselected value. ([#17045](https://github.com/craftcms/cms/issues/17045))
+- Fixed a bug where batched jobs that were pushed without an explicit TTR were getting new jobs spawned after each item processed. ([#17058](https://github.com/craftcms/cms/pull/17058))
 
 ## 4.15.0-beta.1 - 2025-04-08
 

src/queue/BaseBatchedJob.php

@@ -12,6 +12,7 @@
 use craft\helpers\ConfigHelper;
 use craft\helpers\Queue as QueueHelper;
 use craft\i18n\Translation;
+use yii\queue\RetryableJobInterface;
 
 /**
  * BaseBatchedJob is the base class for large jobs that may need to spawn
@@ -61,6 +62,18 @@ abstract class BaseBatchedJob extends BaseJob
     private ?Batchable $_data = null;
     private ?int $_totalItems = null;
 
+    /**
+     * @inheritdoc
+     */
+    public function init(): void
+    {
+        parent::init();
+
+        $this->ttr = $this->ttr ??
+            ($this instanceof RetryableJobInterface ? $this->getTtr() : null) ??
+            Craft::$app->getQueue()->ttr;
+    }
+
     public function __sleep(): array
     {
         return array_keys(Craft::getObjectVars($this));
@@ -142,10 +155,10 @@ public function execute($queue): void
                 }
             }
 
-            // Make sure we don't hit the TTL, even if the next item takes twice as long as the average
+            // Make sure we don't hit the TTR, even if the next item takes twice as long as the average
             $runningTime = microtime(true) - $start;
             $avgRunningTime = $runningTime / $i;
-            if ($runningTime + ($avgRunningTime * 2) > $this->ttr) {
+            if ($this->ttr !== null && $runningTime + ($avgRunningTime * 2) > $this->ttr) {
                 break;
             }