self/sprint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaner fix final

Browse Source
This commit is contained in:
Egor Matveev 2022-05-07 22:36:59 +03:00
parent 03e5531268
commit fb318ea59a
2 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
SprintLib/testers/BaseTester.py
View File

@ -5,7 +5,7 @@ from tempfile import TemporaryDirectory
from Main.models.progress import Progress from Main.models.progress import Progress
from Sprint.settings import CONSTS from Sprint.settings import CONSTS
from SprintLib.queue import notify, send_to_queue from SprintLib.queue import notify
from SprintLib.utils import Timer from SprintLib.utils import Timer
@ -120,34 +120,6 @@ class BaseTester:
def cleanup(self): def cleanup(self):
self.solution.save() self.solution.save()
send_to_queue(
"cleaner", {"type": "container", "name": f"solution_{self.solution.id}"}
)
if self.checker_code:
send_to_queue(
"cleaner",
{"type": "container", "name": f"solution_{self.solution.id}_checker"},
)
for file in self.solution.task.dockerfiles:
add_name = file.filename[11:]
send_to_queue(
"cleaner",
{
"type": "container",
"name": f"solution_container_{self.solution.id}_{add_name}",
},
)
send_to_queue(
"cleaner",
{
"type": "image",
"name": f"solution_image_{self.solution.id}_{add_name}",
},
)
send_to_queue(
"cleaner",
{"type": "network", "name": f"solution_network_{self.solution.id}"},
)
def save_progress(self): def save_progress(self):
progress = Progress.objects.get( progress = Progress.objects.get(

8
daemons/management/commands/docker_cleaner.py
View File

@ -20,7 +20,7 @@ class Command(LoopWorker):
break break
if solution_id: if solution_id:
solution = Solution.objects.filter(id=solution_id).first() solution = Solution.objects.filter(id=solution_id).first()
if solution is not None and (solution.result == 'In queue' or solution.result == 'Testing'): if solution is not None and (solution.result == 'In queue' or solution.result.startswith('Testing')):
continue continue
call(f"docker rm --force {line[-1]}", shell=True) call(f"docker rm --force {line[-1]}", shell=True)
solution_id = None solution_id = None
@ -35,7 +35,7 @@ class Command(LoopWorker):
break break
if solution_id: if solution_id:
solution = Solution.objects.filter(id=solution_id).first() solution = Solution.objects.filter(id=solution_id).first()
if solution is not None and (solution.result == 'In queue' or solution.result == 'Testing'): if solution is not None and (solution.result == 'In queue' or solution.result.startswith('Testing')):
continue continue
call("docker image rm " + line[0], shell=True) call("docker image rm " + line[0], shell=True)
solution_id = None solution_id = None
@ -50,11 +50,9 @@ class Command(LoopWorker):
break break
if solution_id: if solution_id:
solution = Solution.objects.filter(id=solution_id).first() solution = Solution.objects.filter(id=solution_id).first()
if solution is not None and (solution.result == 'In queue' or solution.result == 'Testing'): if solution is not None and (solution.result == 'In queue' or solution.result.startswith('Testing')):
continue continue
call("docker network rm " + line[0], shell=True) call("docker network rm " + line[0], shell=True)
a = 5
a += 1
def handle(self, *args, **options): def handle(self, *args, **options):
call('docker image rm $(docker images -q mathwave/sprint-repo)', shell=True) call('docker image rm $(docker images -q mathwave/sprint-repo)', shell=True)