ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-01-31 02:46:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure that a task retrieved from a queue is not in aborted status

Browse Source
This commit is contained in:
clearml 2024-12-05 19:07:55 +02:00
parent f59ef65fa6
commit 39c36527e2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apiserver/services/queues.py
View File

@ -26,7 +26,7 @@ from apiserver.bll.queue import QueueBLL
from apiserver.bll.queue.queue_bll import MOVE_FIRST, MOVE_LAST from apiserver.bll.queue.queue_bll import MOVE_FIRST, MOVE_LAST
from apiserver.bll.workers import WorkerBLL from apiserver.bll.workers import WorkerBLL
from apiserver.config_repo import config from apiserver.config_repo import config
from apiserver.database.model.task.task import Task from apiserver.database.model.task.task import Task, TaskStatus
from apiserver.service_repo import APICall, endpoint from apiserver.service_repo import APICall, endpoint
from apiserver.services.utils import ( from apiserver.services.utils import (
conform_tag_fields, conform_tag_fields,
@ -170,9 +170,14 @@ def get_next_task(call: APICall, company_id, request: GetNextTaskRequest):
) )
if entry: if entry:
data = {"entry": entry.to_proper_dict()} data = {"entry": entry.to_proper_dict()}
if request.get_task_info: task = Task.objects(id=entry.task).only("company", "user", "status").first()
task = Task.objects(id=entry.task).only("company", "user").first()
if task: if task:
# fix racing condition that can result in the task being aborted
# by an agent after it was already placed in a queue
if task.status == TaskStatus.stopped:
task.update(status=TaskStatus.queued)
if request.get_task_info:
data["task_info"] = {"company": task.company, "user": task.user} data["task_info"] = {"company": task.company, "user": task.user}
call.result.data = data call.result.data = data