mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4253 from nextcloud/downstream-27599 

make JobList::next() lock free
This commit is contained in:
Roeland Jago Douma 2017-04-07 22:18:40 +02:00 committed by GitHub
parent 8838ed4c2e c993c363e0
commit 6c0cafb10f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/private/BackgroundJob/JobList.php
View File

@ -187,18 +187,24 @@ class JobList implements IJobList {
$update->update('jobs')
->set('reserved_at', $update->createNamedParameter($this->timeFactory->getTime()))
->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime()))
->where($update->expr()->eq('id', $update->createParameter('jobid')));
->where($update->expr()->eq('id', $update->createParameter('jobid')))
->andWhere($update->expr()->eq('reserved_at', $update->createParameter('reserved_at')))
->andWhere($update->expr()->eq('last_checked', $update->createParameter('last_checked')));
$this->connection->lockTable('jobs');
$result = $query->execute();
$row = $result->fetch();
$result->closeCursor();
if ($row) {
$update->setParameter('jobid', $row['id']);
$update->execute();
$this->connection->unlockTable();
$update->setParameter('reserved_at', $row['reserved_at']);
$update->setParameter('last_checked', $row['last_checked']);
$count = $update->execute();
if ($count === 0) {
// Background job already executed elsewhere, try again.
return $this->getNext();
}
$job = $this->buildJob($row);
if ($job === null) {
@ -208,7 +214,6 @@ class JobList implements IJobList {
return $job;
} else {
$this->connection->unlockTable();
return null;
}
}