Merge branch 'feature-wrap-all-celery-tasks-in-transactions'

golemfactory · Jun 20, 2018 · 46a7605 · 46a7605
2 parents a0aa853 + 806c027
commit 46a7605
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/concent_api/conductor/tasks.py b/concent_api/conductor/tasks.py
@@ -1,5 +1,7 @@
 import logging
 from celery import shared_task
+from django.db import transaction
+
 from core import tasks
 from utils.constants import ErrorCode
 from utils.decorators import log_task_errors
@@ -19,6 +21,7 @@
 @shared_task
 @provides_concent_feature('conductor-worker')
 @log_task_errors
+@transaction.atomic(using='storage')
 def blender_verification_request(
     subtask_id:             str,
     source_package_path:    str,
@@ -89,6 +92,7 @@ def blender_verification_request(
 
 @shared_task
 @log_task_errors
+@transaction.atomic(using='storage')
 def upload_acknowledged(
     subtask_id: str,
     source_file_size: str,

diff --git a/concent_api/core/tasks.py b/concent_api/core/tasks.py
@@ -31,6 +31,7 @@
 
 @shared_task
 @log_task_errors
+@transaction.atomic(using='control')
 def upload_finished(subtask_id: str):
     try:
         subtask = Subtask.objects.get(subtask_id=subtask_id)