Skip to content

Remove transaction from fetch work API. #2843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2024
+31 −29
Merged

Remove transaction from fetch work API. #2843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions webapp/src/Controller/API/JudgehostController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1600,40 +1600,42 @@ public function getJudgeTasksAction(Request $request): array
// This is case 2.a) from above: start something new.
// This runs transactional to prevent a queue task being picked up twice.
$judgetasks = null;
$this->em->wrapInTransaction(function () use ($judgehost, $max_batchsize, &$judgetasks) {
$jobid = $this->em->createQueryBuilder()
->from(QueueTask::class, 'qt')
->innerJoin('qt.judging', 'j')
->select('j.judgingid')
$jobid = $this->em->createQueryBuilder()
->from(QueueTask::class, 'qt')
->innerJoin('qt.judging', 'j')
->select('j.judgingid')
->andWhere('qt.startTime IS NULL')
->addOrderBy('qt.priority')
->addOrderBy('qt.teamPriority')
->setMaxResults(1)
->getQuery()
->getOneOrNullResult(AbstractQuery::HYDRATE_SINGLE_SCALAR);
if ($jobid !== null) {
// Mark it as being worked on.
$result = $this->em->createQueryBuilder()
->update(QueueTask::class, 'qt')
->set('qt.startTime', Utils::now())
->andWhere('qt.judging = :jobid')
->andWhere('qt.startTime IS NULL')
->addOrderBy('qt.priority')
->addOrderBy('qt.teamPriority')
->setMaxResults(1)
->setParameter('jobid', $jobid)
->getQuery()
->getOneOrNullResult(AbstractQuery::HYDRATE_SINGLE_SCALAR);
if ($jobid === null) {
return;
}
$judgetasks = $this->getJudgetasks($jobid, $max_batchsize, $judgehost);
if (empty($judgetasks)) {
// Somehow we got ourselves in a situation that there was a queue task without remaining judge tasks.
// This should not happen, but if it does, we need to clean up. Each of the fetch-work calls will clean
// up one queue task. We need to signal to the judgehost that there might be more work to do.
->execute();

if ($result == 0) {
// Another judgehost beat us to it.
$judgetasks = [['type' => 'try_again']];
} else {
// Mark it as being worked on.
$this->em->createQueryBuilder()
->update(QueueTask::class, 'qt')
->set('qt.startTime', Utils::now())
->andWhere('qt.judging = :jobid')
->andWhere('qt.startTime IS NULL')
->setParameter('jobid', $jobid)
->getQuery()
->execute();
$judgetasks = $this->getJudgetasks($jobid, $max_batchsize, $judgehost);
if (empty($judgetasks)) {
// Somehow we got ourselves in a situation that there was a queue task without remaining judge tasks.
// This should not happen, but if it does, we need to clean up. Each of the fetch-work calls will clean
// up one queue task. We need to signal to the judgehost that there might be more work to do.
$judgetasks = [['type' => 'try_again']];
}
}
if (!empty($judgetasks)) {
return $judgetasks;
}
});
if (!empty($judgetasks)) {
return $judgetasks;
}

if ($this->config->get('enable_parallel_judging')) {
Expand Down
Loading