Skip to content

Fix: make job deletion safer #77

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

Merged
danielplohmann merged 2 commits into from
Jun 20, 2024
Merged

Fix: make job deletion safer #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9349a20
Fix: make job deletion safer
yankovs Jun 10, 2024
0a4e99d
Remove redundant call
yankovs Jun 10, 2024
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
14 changes: 12 additions & 2 deletions mcrit/libs/mongoqueue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,18 @@ def delete_job(self, job_id, with_result=True):
print(deletable_job)
if "file_params" in deletable_job["payload"]:
file_params_dict = json.loads(deletable_job["payload"]["file_params"])
for k, file_object_id in file_params_dict.items():
self._getFs().delete(ObjectId(file_object_id))
for _, file_object_id in file_params_dict.items():
file_object_id = ObjectId(file_object_id)
# update gridFs entry of file to not link
# to this job anymore
self._getFs().update_one(
{"_id": file_object_id}, {"$pull": {"metadata.jobs": str(job_id)}}
)
# check if file is safe to delete
if self._getFs().count_documents(
{"_id": file_object_id, "metadata.jobs": [], "metadata.tmp_lock": 0}
) > 0:
self._getFs().delete(file_object_id)
if with_result:
# delete result from GridFS
self._getFs().delete(ObjectId(deletable_job["result"]))
Expand Down