Detect a busy run by identity, and clean up a failed kit write

step() hands back the same Run object when another process holds the lease; comparing update times per second could stop the scheduled job early after a quick step. A failed write of the recovery kit file now closes the handle and removes the partial file.
2026-10-07 00:48:11 +02:00
parent b89b5b5fa6
commit b37a953cfd
2 changed files with 12 additions and 6 deletions
@@ -46,11 +46,11 @@ final class BackupJob extends TimedJob {
 		$this->startScheduled();
 		foreach ($this->runs->findRunning(null, BackupService::KIND_FULL) as $run) {
 			while (microtime(true) < $deadline && $run->getStatus() === 'running') {
-				$before = $run->getUpdatedAt();
-				$run = $this->backups->step($run, min($deadline, microtime(true) + $budget));
-				if ($run->getUpdatedAt() === $before && $run->getStatus() === 'running') {
-					break; // another process holds this run's lease: leave it to that process
+				$next = $this->backups->step($run, min($deadline, microtime(true) + $budget));
+				if ($next === $run) {
+					break; // step() hands back the same object when another process holds the run's lease
 				}
+				$run = $next;
 			}
 		}
 		$this->failStaleRestores();