[Project] Fix concurrent project deletion [1.6.x] (#5282)

mlrun · Mar 13, 2024 · 79a661a · 79a661a
1 parent 2f7cf62
commit 79a661a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/server/api/api/endpoints/projects.py b/server/api/api/endpoints/projects.py
@@ -224,7 +224,8 @@ async def delete_project(
             db_session,
             auth_info,
         )
-        background_tasks.add_task(task)
+        if task:
+            background_tasks.add_task(task)
         return fastapi.Response(status_code=http.HTTPStatus.ACCEPTED.value)
 
     is_running_in_background = await run_in_threadpool(

diff --git a/server/api/api/endpoints/projects_v2.py b/server/api/api/endpoints/projects_v2.py
@@ -110,7 +110,8 @@ async def delete_project(
         db_session,
         auth_info,
     )
-    background_tasks.add_task(task)
+    if task:
+        background_tasks.add_task(task)
 
     response.status_code = http.HTTPStatus.ACCEPTED.value
     return server.api.utils.background_tasks.InternalBackgroundTasksHandler().get_background_task(

diff --git a/server/api/api/utils.py b/server/api/api/utils.py
@@ -1116,10 +1116,11 @@ def get_or_create_project_deletion_background_task(
 
     background_task_kind = background_task_kind_format.format(project_name)
     try:
-        return server.api.utils.background_tasks.InternalBackgroundTasksHandler().get_active_background_task_by_kind(
+        task = server.api.utils.background_tasks.InternalBackgroundTasksHandler().get_active_background_task_by_kind(
             background_task_kind,
             raise_on_not_found=True,
         )
+        return None, task.metadata.name
     except mlrun.errors.MLRunNotFoundError:
         logger.debug(
             "Existing background task not found, creating new one",