Delete Job.keep_sandbox

Author: prandla

cms/grading/Job.py

@@ -87,7 +87,6 @@ def __init__(
         multithreaded_sandbox: bool = False,
         archive_sandbox: bool = False,
         shard: int | None = None,
-        keep_sandbox: bool = False,
         sandboxes: list[str] | None = None,
         sandbox_digests: dict[str, str] | None = None,
         info: str | None = None,
@@ -109,9 +108,6 @@ def __init__(
             allow multithreading.
         archive_sandbox: whether the sandbox is to be archived.
         shard: the shard of the Worker completing this job.
-        keep_sandbox: whether to forcefully keep the sandbox,
-            even if other conditions (the config, the sandbox status)
-            don't warrant it.
         sandboxes: the paths of the sandboxes used in
             the Worker during the execution of the job.
         sandbox_digests: the digests of the sandbox archives used to
@@ -151,7 +147,6 @@ def __init__(
         self.multithreaded_sandbox = multithreaded_sandbox
         self.archive_sandbox = archive_sandbox
         self.shard = shard
-        self.keep_sandbox = keep_sandbox
         self.sandboxes = sandboxes
         self.sandbox_digests = sandbox_digests
         self.info = info
@@ -176,7 +171,6 @@ def export_to_dict(self) -> dict:
             'multithreaded_sandbox': self.multithreaded_sandbox,
             'archive_sandbox': self.archive_sandbox,
             'shard': self.shard,
-            'keep_sandbox': self.keep_sandbox,
             'sandboxes': self.sandboxes,
             'sandbox_digests': self.sandbox_digests,
             'info': self.info,
@@ -308,7 +302,6 @@ def __init__(
         task_type: str | None = None,
         task_type_parameters: object = None,
         shard: int | None = None,
-        keep_sandbox: bool = False,
         sandboxes: list[str] | None = None,
         sandbox_digests: dict[str, str] | None = None,
         info: str | None = None,
@@ -336,7 +329,7 @@ def __init__(
 
         Job.__init__(self, operation, task_type, task_type_parameters,
                      language, multithreaded_sandbox, archive_sandbox,
-                     shard, keep_sandbox, sandboxes, sandbox_digests, info, success,
+                     shard, sandboxes, sandbox_digests, info, success,
                      text, admin_text, files, managers, executables)
         self.compilation_success = compilation_success
         self.plus = plus
@@ -526,7 +519,6 @@ def __init__(
         task_type: str | None = None,
         task_type_parameters: object = None,
         shard: int | None = None,
-        keep_sandbox: bool = False,
         sandboxes: list[str] | None = None,
         sandbox_digests: dict[str, str] | None = None,
         info: str | None = None,
@@ -573,7 +565,7 @@ def __init__(
         """
         Job.__init__(self, operation, task_type, task_type_parameters,
                      language, multithreaded_sandbox, archive_sandbox,
-                     shard, keep_sandbox, sandboxes, sandbox_digests, info, success,
+                     shard, sandboxes, sandbox_digests, info, success,
                      text, admin_text, files, managers, executables)
         self.input = input
         self.output = output

cms/grading/tasktypes/Communication.py

@@ -443,6 +443,6 @@ def evaluate(self, job: EvaluationJob, file_cacher: FileCacher):
         delete_sandbox(sandbox_mgr, job, file_cacher)
         for s in sandbox_user:
             delete_sandbox(s, job, file_cacher)
-        if job.success and not job.keep_sandbox:
+        if job.success:
             for d in fifo_dir:
                 rmtree(d)