wip

dmoj/judge.py

@@ -311,6 +311,7 @@ def log_internal_error(self, exc: Optional[BaseException] = None, message: Optio
 class JudgeWorker:
     def __init__(self, submission: Submission) -> None:
         self.submission = submission
+        self._aborted = True
         self._sent_sigkill_to_worker_process = False
         # FIXME(tbrindus): marked Any pending grader cleanups.
         self.grader: Any = None
@@ -337,9 +338,13 @@ def communicate(self) -> Generator[Tuple[IPC, tuple], None, None]:
                 self.worker_process.kill()
                 raise
             except EOFError:
-                if self._sent_sigkill_to_worker_process:
+                if self._aborted:
+                    # Expected, the pipe is broken.
+                    pass
+                elif self._sent_sigkill_to_worker_process:
                     raise TimeoutError('worker did not exit in %d seconds, so it was killed' % IPC_TIMEOUT)
-                raise
+                else:
+                    raise
             except Exception:
                 logger.error('Failed to read IPC message from worker!')
                 raise
@@ -365,6 +370,7 @@ def wait_with_timeout(self) -> None:
 
     def abort_grading__kill_worker(self) -> None:
         if self.worker_process and self.worker_process.is_alive():
+            self._aborted = True
             self._sent_sigkill_to_worker_process = True
             self.worker_process.kill()
             self.worker_process.join(timeout=1)