Merge pull request #41359 from nextcloud/backport/41295/stable27

[stable27] fix(JobList#hasReservedJob): Break tie when multiple jobs are reserved
nextcloud · Nov 10, 2023 · 8e29b02 · 8e29b02
2 parents 4ffee4f + 708c0a8
commit 8e29b02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php
@@ -406,7 +406,7 @@ public function hasReservedJob(?string $className = null): bool {
 		$query = $this->connection->getQueryBuilder();
 		$query->select('*')
 			->from('jobs')
-			->where($query->expr()->neq('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
+			->where($query->expr()->gt('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - 6 * 3600, IQueryBuilder::PARAM_INT)))
 			->setMaxResults(1);
 
 		if ($className !== null) {

diff --git a/lib/public/BackgroundJob/IJobList.php b/lib/public/BackgroundJob/IJobList.php
@@ -147,7 +147,8 @@ public function setExecutionTime(IJob $job, int $timeTaken): void;
 	public function resetBackgroundJob(IJob $job): void;
 
 	/**
-	 * Checks whether a job of the passed class is reserved to run
+	 * Checks whether a job of the passed class was reserved to run
+	 * in the last 6h
 	 *
 	 * @param string|null $className
 	 * @return bool