github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-24 21:08:30 +00:00
Code Issues Projects Releases Wiki Activity

perf: 修复事务中任务执行

Browse Source
This commit is contained in:
ibuler
2023-09-21 14:28:34 +08:00
committed by 老广
parent b023ca0c69
commit cdbe5d31e9
7 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/ops/api/job.py
View File

@@ -1,7 +1,5 @@
from django.conf import settings
from django.db import transaction
from django.db.models import Count
from django.db.transaction import atomic
from django.shortcuts import get_object_or_404
from rest_framework.response import Response
from rest_framework.views import APIView
@@ -88,8 +86,7 @@ class JobViewSet(OrgBulkModelViewSet):
execution.save()
set_task_to_serializer_data(serializer, execution.id)
transaction.on_commit(
lambda: run_ops_job_execution.apply_async((str(execution.id),), task_id=str(execution.id)))
run_ops_job_execution.apply_async((str(execution.id),), task_id=str(execution.id))
class JobExecutionViewSet(OrgBulkModelViewSet):
@@ -112,8 +109,7 @@ class JobExecutionViewSet(OrgBulkModelViewSet):
instance.save()
set_task_to_serializer_data(serializer, instance.id)
transaction.on_commit(
lambda: run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id)))
run_ops_job_execution.apply_async((str(instance.id),), task_id=str(instance.id))
def get_queryset(self):
queryset = super().get_queryset()

2
apps/ops/tasks.py
View File

@@ -5,6 +5,7 @@ from celery.exceptions import SoftTimeLimitExceeded
from django.utils.translation import gettext_lazy as _
from django_celery_beat.models import PeriodicTask
from common.decorators import on_transaction_commit
from common.utils import get_logger, get_object_or_none
from ops.celery import app
from orgs.utils import tmp_to_org, tmp_to_root_org
@@ -68,6 +69,7 @@ def job_execution_task_activity_callback(self, execution_id, *args, **kwargs):
soft_time_limit=60, queue="ansible", verbose_name=_("Run ansible task execution"),
activity_callback=job_execution_task_activity_callback
)
@on_transaction_commit
def run_ops_job_execution(execution_id, **kwargs):
with tmp_to_root_org():
execution = get_object_or_none(JobExecution, id=execution_id)