Lock, and transaction-free entry_point update

Author: tuupke

ifuckedup.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+
+# Dump the database
+ ./bin/dj_setup_database -u root -p domjudge uninstall
+
+# Import the database
+ ./bin/dj_setup_database -u root -p domjudge bare-install
+
+# Clean the workdir
+sudo ./bin/dj_judgehost_cleanup all
+
+sudo rm -rf output/judgings/*
+
+# Import the problem
+cd example_problems
+yes | ../misc-tools/import-contest
+cd -
+
+notify-send Done!

webapp/src/Controller/API/JudgehostController.php

@@ -313,33 +313,88 @@ public function updateJudgingAction(
         }
 
         if ($request->request->has('output_compile')) {
+            $output_compile = base64_decode($request->request->get('output_compile'));
+
             // Note: we use ->get here instead of ->has since entry_point can be the empty string and then we do not
             // want to update the submission or send out an update event
             if ($request->request->get('entry_point')) {
-                $this->em->wrapInTransaction(function () use ($query, $request, &$judging) {
-                    $submission = $judging->getSubmission();
-                    if ($submission->getEntryPoint() === $request->request->get('entry_point')) {
-                        return;
+                // Lock-free setting of, and detection of mismatched entry_point.
+                $submission = $judging->getSubmission();
+
+                // Retrieve, and update the current entrypoint.
+                $oldEntryPoint = $submission->getEntryPoint();
+                $newEntryPoint = $request->request->get('entry_point');
+
+
+                if ($oldEntryPoint === $newEntryPoint) {
+                    // Nothing to do
+                } else if (!empty($oldEntryPoint)) {
+                    // Conflict detected disable the judgehost.
+                    $disabled = [
+                        'kind' => 'judgehost',
+                        'hostname' => $judgehost->getHostname(),
+                    ];
+                    $error = new InternalError();
+                    $error
+                        ->setJudging($judging)
+                        ->setContest($judging->getContest())
+                        ->setDescription('Reported EntryPoint conflict difference for j' . $judging->getJudgingid().'. Expected: "' . $oldEntryPoint. '", received: "' . $newEntryPoint . '".')
+                        ->setJudgehostlog(base64_encode('New compilation output: ' . $output_compile))
+                        ->setTime(Utils::now())
+                        ->setDisabled($disabled);
+                    $this->em->persist($error);
+                } else {
+                    // Update needed. Note, conflicts might still be possible.
+
+                    $rowsAffected = $this->em->createQueryBuilder()
+                        ->update(Submission::class, 's')
+                        ->set('entry_point', $newEntryPoint)
+                        ->where('submitid = :id')
+                        ->andWhere('entry_point IS NULL')
+                        ->setParameter('id', $submission->getSubmitid())
+                        ->getQuery()
+                        ->execute();
+
+                    if ($rowsAffected == 0) {
+                        // There is a potential conflict, two options.
+                        // The new entry point is either the same (no issue) or different (conflict).
+                        // Read the entrypoint and check.
+                        $this->em->clear();
+                        $currentEntryPoint = $query->getOneOrNullResult()->getSubmission()->getEntryPoint();
+                        if ($newEntryPoint !== $currentEntryPoint) {
+                            // Conflict detected disable the judgehost.
+                            $disabled = [
+                                'kind' => 'judgehost',
+                                'hostname' => $judgehost->getHostname(),
+                            ];
+                            $error = new InternalError();
+                            $error
+                                ->setJudging($judging)
+                                ->setContest($judging->getContest())
+                                ->setDescription('Reported EntryPoint conflict difference for j' . $judging->getJudgingid().'. Expected: "' . $oldEntryPoint. '", received: "' . $newEntryPoint . '".')
+                                ->setJudgehostlog(base64_encode('New compilation output: ' . $output_compile))
+                                ->setTime(Utils::now())
+                                ->setDisabled($disabled);
+                            $this->em->persist($error);
+                        }
+                    } else {
+                        $submissionId = $submission->getSubmitid();
+                        $contestId    = $submission->getContest()->getCid();
+                        $this->eventLogService->log('submission', $submissionId,
+                            EventLogService::ACTION_UPDATE, $contestId);
                     }
-                    $submission->setEntryPoint($request->request->get('entry_point'));
-                    $this->em->flush();
-                    $submissionId = $submission->getSubmitid();
-                    $contestId    = $submission->getContest()->getCid();
-                    $this->eventLogService->log('submission', $submissionId,
-                                                EventLogService::ACTION_UPDATE, $contestId);
 
-                    // As EventLogService::log() will clear the entity manager, so the judging has
-                    // now become detached. We will have to reload it.
+                    // As EventLogService::log() will clear the entity manager, both branches clear the entity manager.
+                    // The judging is now detached, reload it.
                     /** @var Judging $judging */
                     $judging = $query->getOneOrNullResult();
-                });
+                }
             }
 
             // Reload judgehost just in case it got cleared above.
             /** @var Judgehost $judgehost */
             $judgehost = $this->em->getRepository(Judgehost::class)->findOneBy(['hostname' => $hostname]);
 
-            $output_compile = base64_decode($request->request->get('output_compile'));
             if ($request->request->getBoolean('compile_success')) {
                 if ($judging->getOutputCompile() === null) {
                     $judging