ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-04-21 22:54:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Tasks.reset does not mark children's parent as deleted

Browse Source
This commit is contained in:
allegroai 2021-05-03 16:57:06 +03:00
parent 7d6918ecb0
commit 749ff4a44f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apiserver/services/tasks.py
View File

@ -849,7 +849,7 @@ def reset(call: APICall, company_id, request: ResetRequest):
if dequeued: if dequeued:
api_results.update(dequeued=dequeued) api_results.update(dequeued=dequeued)
cleaned_up = cleanup_task(task, force) cleaned_up = cleanup_task(task, force=force, update_children=False)
api_results.update(attr.asdict(cleaned_up)) api_results.update(attr.asdict(cleaned_up))
updates.update( updates.update(
@ -984,7 +984,7 @@ class CleanupResult(object):
deleted_models = attr.ib(type=int) deleted_models = attr.ib(type=int)
def cleanup_task(task: Task, force: bool = False): def cleanup_task(task: Task, force: bool = False, update_children=True):
""" """
Validate task deletion and delete/modify all its output. Validate task deletion and delete/modify all its output.
:param task: task object :param task: task object
@ -993,7 +993,7 @@ def cleanup_task(task: Task, force: bool = False):
""" """
models, child_tasks = get_outputs_for_deletion(task, force) models, child_tasks = get_outputs_for_deletion(task, force)
deleted_task_id = trash_task_id(task.id) deleted_task_id = trash_task_id(task.id)
if child_tasks: if child_tasks and update_children:
with TimingContext("mongo", "update_task_children"): with TimingContext("mongo", "update_task_children"):
updated_children = child_tasks.update(parent=deleted_task_id) updated_children = child_tasks.update(parent=deleted_task_id)
else: else:
@ -1005,7 +1005,7 @@ def cleanup_task(task: Task, force: bool = False):
else: else:
deleted_models = 0 deleted_models = 0
if models.published: if models.published and update_children:
with TimingContext("mongo", "update_task_models"): with TimingContext("mongo", "update_task_models"):
updated_models = models.published.objects().update(task=deleted_task_id) updated_models = models.published.objects().update(task=deleted_task_id)
else: else:
@ -1095,7 +1095,7 @@ def delete(call: APICall, company_id, req_model: DeleteRequest):
) )
with translate_errors_context(): with translate_errors_context():
result = cleanup_task(task, force) result = cleanup_task(task, force=force)
if move_to_trash: if move_to_trash:
collection_name = task._get_collection_name() collection_name = task._get_collection_name()