From fa948f7327e817e7db11c14f88abdc1e8bac1f80 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Thu, 24 Nov 2022 00:50:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20job=20=E5=A2=9E=E5=8A=A0=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ops/api/job.py | 24 ++++++------ apps/ops/migrations/0034_job_org_id.py | 18 +++++++++ .../migrations/0035_jobexecution_org_id.py | 18 +++++++++ apps/ops/models/job.py | 8 ++-- apps/ops/serializers/job.py | 5 +-- apps/ops/tasks.py | 37 ++++++++++--------- 6 files changed, 74 insertions(+), 36 deletions(-) create mode 100644 apps/ops/migrations/0034_job_org_id.py create mode 100644 apps/ops/migrations/0035_jobexecution_org_id.py diff --git a/apps/ops/api/job.py b/apps/ops/api/job.py index eaad4514c..86a52f373 100644 --- a/apps/ops/api/job.py +++ b/apps/ops/api/job.py @@ -1,4 +1,3 @@ -from django.shortcuts import get_object_or_404 from rest_framework import viewsets from ops.models import Job, JobExecution @@ -7,14 +6,17 @@ from ops.serializers.job import JobSerializer, JobExecutionSerializer __all__ = ['JobViewSet', 'JobExecutionViewSet'] from ops.tasks import run_ops_job, run_ops_job_executions +from orgs.mixins.api import OrgBulkModelViewSet -class JobViewSet(viewsets.ModelViewSet): +class JobViewSet(OrgBulkModelViewSet): serializer_class = JobSerializer - queryset = Job.objects.all() + model = Job + permission_classes = () def get_queryset(self): - return self.queryset.filter(instant=False) + query_set = super().get_queryset() + return query_set.filter(instant=False) def perform_create(self, serializer): instance = serializer.save() @@ -22,20 +24,20 @@ class JobViewSet(viewsets.ModelViewSet): run_ops_job.delay(instance.id) -class JobExecutionViewSet(viewsets.ModelViewSet): +class JobExecutionViewSet(OrgBulkModelViewSet): serializer_class = JobExecutionSerializer - queryset = JobExecution.objects.all() http_method_names = ('get', 'post', 'head', 'options',) + # filter_fields = ('type',) + permission_classes = () + model = JobExecution def perform_create(self, serializer): instance = serializer.save() run_ops_job_executions.delay(instance.id) def get_queryset(self): + query_set = super().get_queryset() job_id = self.request.query_params.get('job_id') - job_type = self.request.query_params.get('type') if job_id: - self.queryset = self.queryset.filter(job_id=job_id) - if job_type: - self.queryset = self.queryset.filter(job__type=job_type) - return self.queryset + self.queryset = query_set.filter(job_id=job_id) + return query_set diff --git a/apps/ops/migrations/0034_job_org_id.py b/apps/ops/migrations/0034_job_org_id.py new file mode 100644 index 000000000..07926cec3 --- /dev/null +++ b/apps/ops/migrations/0034_job_org_id.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.14 on 2022-11-23 09:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ops', '0033_auto_20221118_1431'), + ] + + operations = [ + migrations.AddField( + model_name='job', + name='org_id', + field=models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization'), + ), + ] diff --git a/apps/ops/migrations/0035_jobexecution_org_id.py b/apps/ops/migrations/0035_jobexecution_org_id.py new file mode 100644 index 000000000..1161d10e3 --- /dev/null +++ b/apps/ops/migrations/0035_jobexecution_org_id.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.14 on 2022-11-23 10:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ops', '0034_job_org_id'), + ] + + operations = [ + migrations.AddField( + model_name='jobexecution', + name='org_id', + field=models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization'), + ), + ] diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py index d5542970d..f2e7eaa4b 100644 --- a/apps/ops/models/job.py +++ b/apps/ops/models/job.py @@ -9,16 +9,14 @@ from django.utils.translation import gettext_lazy as _ from django.utils import timezone from celery import current_task -from common.const.choices import Trigger -from common.db.models import BaseCreateUpdateModel - __all__ = ["Job", "JobExecution"] from ops.ansible import JMSInventory, AdHocRunner, PlaybookRunner from ops.mixin import PeriodTaskModelMixin +from orgs.mixins.models import JMSOrgBaseModel -class Job(BaseCreateUpdateModel, PeriodTaskModelMixin): +class Job(JMSOrgBaseModel, PeriodTaskModelMixin): class Types(models.TextChoices): adhoc = 'adhoc', _('Adhoc') playbook = 'playbook', _('Playbook') @@ -94,7 +92,7 @@ class Job(BaseCreateUpdateModel, PeriodTaskModelMixin): return self.executions.create() -class JobExecution(BaseCreateUpdateModel): +class JobExecution(JMSOrgBaseModel): id = models.UUIDField(default=uuid.uuid4, primary_key=True) task_id = models.UUIDField(null=True) status = models.CharField(max_length=16, verbose_name=_('Status'), default='running') diff --git a/apps/ops/serializers/job.py b/apps/ops/serializers/job.py index 389b92ce2..e5d76f85b 100644 --- a/apps/ops/serializers/job.py +++ b/apps/ops/serializers/job.py @@ -1,14 +1,13 @@ -from django.db import transaction from rest_framework import serializers - from common.drf.fields import ReadableHiddenField from ops.mixin import PeriodTaskSerializerMixin from ops.models import Job, JobExecution +from orgs.mixins.serializers import BulkOrgResourceModelSerializer _all_ = [] -class JobSerializer(serializers.ModelSerializer, PeriodTaskSerializerMixin): +class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin): owner = ReadableHiddenField(default=serializers.CurrentUserDefault()) class Meta: diff --git a/apps/ops/tasks.py b/apps/ops/tasks.py index 841f759ff..51541dd32 100644 --- a/apps/ops/tasks.py +++ b/apps/ops/tasks.py @@ -10,6 +10,7 @@ from django.utils import timezone from django.utils.translation import ugettext_lazy as _ from common.utils import get_logger, get_object_or_none, get_log_keep_day +from orgs.utils import tmp_to_org from .celery.decorator import ( register_as_period_task, after_app_shutdown_clean_periodic, after_app_ready_start @@ -27,28 +28,30 @@ logger = get_logger(__file__) @shared_task(soft_time_limit=60, queue="ansible", verbose_name=_("Run ansible task")) def run_ops_job(job_id): job = get_object_or_none(Job, id=job_id) - execution = job.create_execution() - try: - execution.start() - except SoftTimeLimitExceeded: - execution.set_error('Run timeout') - logger.error("Run adhoc timeout") - except Exception as e: - execution.set_error(e) - logger.error("Start adhoc execution error: {}".format(e)) + with tmp_to_org(job.org): + execution = job.create_execution() + try: + execution.start() + except SoftTimeLimitExceeded: + execution.set_error('Run timeout') + logger.error("Run adhoc timeout") + except Exception as e: + execution.set_error(e) + logger.error("Start adhoc execution error: {}".format(e)) @shared_task(soft_time_limit=60, queue="ansible", verbose_name=_("Run ansible task execution")) def run_ops_job_executions(execution_id, **kwargs): execution = get_object_or_none(JobExecution, id=execution_id) - try: - execution.start() - except SoftTimeLimitExceeded: - execution.set_error('Run timeout') - logger.error("Run adhoc timeout") - except Exception as e: - execution.set_error(e) - logger.error("Start adhoc execution error: {}".format(e)) + with tmp_to_org(execution.org): + try: + execution.start() + except SoftTimeLimitExceeded: + execution.set_error('Run timeout') + logger.error("Run adhoc timeout") + except Exception as e: + execution.set_error(e) + logger.error("Start adhoc execution error: {}".format(e)) @shared_task(verbose_name=_('Periodic clear celery tasks'))