Skip to content

The open alternative to Salesforce, designed for AI.

Keep priority 1 ahead of the fair tickets for the platform's time-critical jobs (#28991)

martmull0e0dc3dc5adf
diff --git a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/__tests__/bullmq.driver.spec.ts b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/__tests__/bullmq.driver.spec.ts
index fad79ebfa27..f9859eaa145 100644
--- a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/__tests__/bullmq.driver.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/__tests__/bullmq.driver.spec.ts
@@ -3,7 +3,10 @@ import { type Job, Worker } from 'bullmq';
import { DEFAULT_JOB_PRIORITY } from 'src/engine/core-modules/message-queue/constants/default-job-priority.constant';
import { QUEUE_JOB_CHANGED_EVENT } from 'src/engine/core-modules/message-queue/constants/queue-job-changed-event.constant';
import { BullMQDriver } from 'src/engine/core-modules/message-queue/drivers/bullmq.driver';
-import { FAIR_TICKET_OFFSET } from 'src/engine/core-modules/message-queue/drivers/fairness/fair-priority.constant';
+import {
+ FAIR_TICKET_OFFSET,
+ URGENT_FAIR_PRIORITY,
+} from 'src/engine/core-modules/message-queue/drivers/fairness/fair-priority.constant';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
import { JOB_LATENCY_MS_BUCKET_BOUNDARIES } from 'src/engine/core-modules/metrics/constants/job-latency-ms-bucket-boundaries.constant';
import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';
@@ -584,6 +587,24 @@ describe('BullMQDriver fair tickets', () => {
]);
});
+ it('keeps priority 1 ahead of the fair tickets while still charging its group keys', async () => {
+ mockAllocateTickets.mockResolvedValue([{ tag: 7, weight: 1 }]);
+
+ await driver.add(
+ MessageQueue.workspaceQueue,
+ 'job',
+ { workspaceId: 'ws-1' },
+ { priority: URGENT_FAIR_PRIORITY },
+ );
+
+ expect(mockAllocateTickets).toHaveBeenCalledTimes(1);
+ expect(mockAdd).toHaveBeenCalledWith(
+ 'job',
+ { workspaceId: 'ws-1' },
+ expect.objectContaining({ priority: URGENT_FAIR_PRIORITY }),
+ );
+ });
+
it('keeps the static priority and counts a fallback when no ticket comes back', async () => {
mockAllocateTickets.mockResolvedValue(undefined);
diff --git a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/fairness/fair-priority.constant.ts b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/fairness/fair-priority.constant.ts
index 5be5183a654..bcdcdcf9172 100644
--- a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/fairness/fair-priority.constant.ts
+++ b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/fairness/fair-priority.constant.ts
@@ -1,3 +1,4 @@
+export const URGENT_FAIR_PRIORITY = 1;
export const FAIR_TICKET_OFFSET = 2;
export const FAIR_CLOCK_TTL_MS = 24 * 60 * 60 * 1000;
diff --git a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/fairness/fair-queue-scheduler.ts b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/fairness/fair-queue-scheduler.ts
index 24b0cc766ff..f54f8ecd67f 100644
--- a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/fairness/fair-queue-scheduler.ts
+++ b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/fairness/fair-queue-scheduler.ts
@@ -1,7 +1,10 @@
import { PRIORITY_LIMIT, type RedisClient } from 'bullmq';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
-import { FAIR_TICKET_OFFSET } from 'src/engine/core-modules/message-queue/drivers/fairness/fair-priority.constant';
+import {
+ FAIR_TICKET_OFFSET,
+ URGENT_FAIR_PRIORITY,
+} from 'src/engine/core-modules/message-queue/drivers/fairness/fair-priority.constant';
import { FairTicketAllocator } from 'src/engine/core-modules/message-queue/drivers/fairness/fair-ticket-allocator';
import { type QueueJobOptions } from 'src/engine/core-modules/message-queue/drivers/interfaces/job-options.interface';
import { type MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
@@ -72,6 +75,10 @@ export class FairQueueScheduler {
})),
});
+ if (staticPriority === URGENT_FAIR_PRIORITY) {
+ return staticPriorities;
+ }
+
if (!isDefined(tickets)) {
void this.options.metricsService.incrementCounterForEvent({
key: MetricsKeys.JobFairTagFallback,