Adopt new bind=True kwarg

Author: AlanCoding

ansible_base/task/migrations/0002_task_wrapper_uuid_alter_task_uuid.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.16 on 2025-02-18 18:13
+
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dab_tas', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='wrapper_uuid',
+            field=models.UUIDField(default=None, editable=False, help_text='Adopted UUID of DAB task app wrapper, attached when background service starts task', null=True),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='uuid',
+            field=models.UUIDField(default=uuid.uuid4, editable=False, help_text='Original dispatcher UUID generated at time of task publishing', primary_key=True, serialize=False),
+        ),
+    ]

ansible_base/task/models.py

@@ -24,7 +24,8 @@ class Task(models.Model):
     Loosely modeled after pulpcore.Task
     """
 
-    uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False, help_text=_('UUID that corresponds to the dispatcher task uuid'))
+    uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False, help_text=_('Original dispatcher UUID generated at time of task publishing'))
+    wrapper_uuid = models.UUIDField(null=True, default=None, editable=False, help_text=_('Adopted UUID of DAB task app wrapper, attached when background service starts task'))
     state = models.CharField(
         choices=[(s, s.title()) for s in sorted(vars(TASK_STATES).values())],
         default=TASK_STATES.WAITING,
@@ -40,11 +41,6 @@ class Task(models.Model):
     started_at = models.DateTimeField(null=True, help_text=_('Time of acknowledgement, also approximately the time the task starts'))
     finished_at = models.DateTimeField(null=True, help_text=_('Time task is cleared (whether failed or succeeded), may be unused if set to auto-delete'))
 
-    def mark_ack(self):
-        self.state = TASK_STATES.RUNNING
-        self.started_at = now()
-        self.save(update_fields=['state', 'started_at'])
-
     def mark_completed(self):
         self.state = TASK_STATES.COMPLETED
         self.finished_at = now()

ansible_base/task/tasks.py

@@ -2,19 +2,24 @@
 
 from dispatcher.utils import resolve_callable
 from dispatcher.publish import task
+
 from django.db import transaction
+from django.utils.timezone import now
 
 from ansible_base.task.models import TASK_STATES, Task
 
 logger = logging.getLogger(__name__)
 
 
-@task(queue='dab_broadcast')
-def run_task_from_queue():
+@task(queue='dab_broadcast', bind=True)
+def run_task_from_queue(dispatcher):
     with transaction.atomic():
         task = Task.objects.filter(state=TASK_STATES.WAITING).select_for_update().first()
         if task:
-            task.mark_ack()
+            task.state = TASK_STATES.RUNNING
+            task.started_at = now()
+            task.wrapper_uuid = dispatcher.uuid
+            task.save(update_fields=['state', 'started_at', 'wrapper_uuid'])
         else:
             return