Merge pull request #60714 from nextcloud/fix/F4-federation-retainjob-reset

fix(federation): reset retainJob at start of run()

Author: artonge

apps/federation/lib/BackgroundJob/GetSharedSecret.php

@@ -75,6 +75,10 @@ protected function parentStart(IJobList $jobList): void {
 
 	#[\Override]
 	protected function run($argument) {
+		// The DI container caches this instance, so a prior invocation in the
+		// same cron pass can leave $retainJob = true and cause this row to be
+		// re-queued unconditionally after start() removes it.
+		$this->retainJob = false;
 		$target = $argument['url'];
 		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
 		$currentTime = $this->time->getTime();

apps/federation/lib/BackgroundJob/RequestSharedSecret.php

@@ -87,6 +87,10 @@ protected function parentStart(IJobList $jobList): void {
 	 */
 	#[\Override]
 	protected function run($argument) {
+		// The DI container caches this instance, so a prior invocation in the
+		// same cron pass can leave $retainJob = true and cause this row to be
+		// re-queued unconditionally after start() removes it.
+		$this->retainJob = false;
 		$target = $argument['url'];
 		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
 		$currentTime = $this->time->getTime();