Skip to content

Ensure jobs have been cancelled before deleting files #407

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

Open
skanderson wants to merge 1 commit into
base: dev
Choose a base branch
from
+13 −2
Open

Ensure jobs have been cancelled before deleting files #407

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
15 changes: 13 additions & 2 deletions cravat/gui/submit/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
import os
import shutil
import time
import traceback

from datetime import datetime
Expand Down Expand Up @@ -348,8 +349,18 @@ def delete_job(job_id):
if job.task_id:
job.task.cancel()

if os.path.exists(job.job_dir):
shutil.rmtree(job.job_dir)
# canceling the task is not immediate. poll the status for a short time before removing files
finished_statuses = (None, 'Aborted', 'Error', 'Finished')
retries = 5
while job.task.cravat_status not in finished_statuses and retries > 0:
time.sleep(.2)
retries -= 1

# do not remove files if the status hasn't been updated, there could still be a worker using them
if retries:
# only delete files if we've confirmed cancellation; otherwise leave them be
if os.path.exists(job.job_dir):
shutil.rmtree(job.job_dir)

return HTTP_NO_CONTENT

Expand Down