fix symmetrical

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
This commit is contained in:
Marc 'risson' Schmitt
2026-06-16 14:55:13 +02:00
parent b9f3cf781a
commit 6318e7a769
4 changed files with 15 additions and 5 deletions
@@ -1,4 +1,4 @@
# Generated by Django 5.2.15 on 2026-06-16 11:54
# Generated by Django 5.2.15 on 2026-06-16 12:54
from django.db import migrations, models
@@ -14,7 +14,6 @@ class Migration(migrations.Migration):
model_name="task",
name="dependencies",
field=models.ManyToManyField(
default=None,
to="authentik_tasks.task",
verbose_name="Tasks that must complete for this task to run.",
),
@@ -308,7 +308,13 @@ class _PostgresConsumer(Consumer):
pending = set(
self.query_set.exclude(message_id__in=self.in_processing)
.filter(queue_name=self.queue_name)
.exclude(state__in=(TaskState.DONE, TaskState.REJECTED))
.exclude(
state__in=(
TaskState.DONE,
TaskState.REJECTED,
TaskState.WAITING_FOR_DEPENDENCIES,
)
)
.exclude(eta__gte=timezone.now() + timedelta(seconds=self.timeout))
.order_by(F("eta").asc(nulls_first=True))
.values_list("message_id", flat=True)
@@ -360,7 +366,11 @@ class _PostgresConsumer(Consumer):
"state": TaskState.CONSUMED.value,
"mtime": timezone.now(),
"message_id": message_id,
"excluded_states": [TaskState.DONE.value, TaskState.REJECTED.value],
"excluded_states": [
TaskState.DONE.value,
TaskState.REJECTED.value,
TaskState.WAITING_FOR_DEPENDENCIES.value,
],
"maximum_eta": timezone.now() + timedelta(seconds=self.timeout),
"lock_id": self._get_message_lock_id(message_id),
},
@@ -57,7 +57,7 @@ class TaskBase(models.Model):
dependencies = models.ManyToManyField(
"self",
verbose_name=_("Tasks that must complete for this task to run."),
default=None,
symmetrical=False,
)
result = models.BinaryField(null=True, help_text=_("Task result"))
+1
View File
@@ -75,6 +75,7 @@ export class TaskList extends Table<Task> {
: undefined;
const aggregatedStatus = this.excludeSuccessful
? [
TaskAggregatedStatusEnum.WaitingForDependencies,
TaskAggregatedStatusEnum.Queued,
TaskAggregatedStatusEnum.Consumed,
TaskAggregatedStatusEnum.Preprocess,