Skip to content

Fixes the jitter option for the scanConcurrencySets cron job #2220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2025
Merged

Fixes the jitter option for the scanConcurrencySets cron job #2220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal-packages/run-engine/src/run-queue/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export class RunQueue {
scanConcurrencySets: {
...workerCatalog.scanConcurrencySets,
cron: options.concurrencySweeper?.scanSchedule ?? workerCatalog.scanConcurrencySets.cron,
jitter:
jitterInMs:
options.concurrencySweeper?.scanJitterInMs ??
workerCatalog.scanConcurrencySets.jitterInMs,
},
Expand Down
7 changes: 6 additions & 1 deletion internal-packages/run-engine/src/run-queue/tests/concurrencySweeper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const testOptions = {
tracer: trace.getTracer("rq"),
workers: 1,
defaultEnvConcurrency: 25,
logger: new Logger("RunQueue", "warn"),
logger: new Logger("RunQueue", "debug"),
retryOptions: {
maxAttempts: 5,
factor: 1.1,
Expand Down Expand Up @@ -59,6 +59,7 @@ describe("RunQueue Concurrency Sweeper", () => {

const queue = new RunQueue({
...testOptions,
logLevel: "debug",
queueSelectionStrategy: new FairQueueSelectionStrategy({
redis: {
keyPrefix: "runqueue:test:",
Expand All @@ -67,6 +68,10 @@ describe("RunQueue Concurrency Sweeper", () => {
},
keys: testOptions.keys,
}),
workerOptions: {
pollIntervalMs: 100,
immediatePollIntervalMs: 100,
},
redis: {
keyPrefix: "runqueue:test:",
host: redisContainer.getHost(),
Expand Down
7 changes: 4 additions & 3 deletions packages/redis-worker/src/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,9 +693,8 @@ class Worker<TCatalog extends WorkerCatalog> {
const scheduledAt = this.calculateNextScheduledAt(cron, lastTimestamp);
const identifier = [job, this.timestampIdentifier(scheduledAt)].join(":");
// Calculate the availableAt date by calculating a random number between -jitter/2 and jitter/2 and adding it to the scheduledAt
const availableAt = jitter
? new Date(scheduledAt.getTime() + Math.random() * jitter - jitter / 2)
: scheduledAt;
const appliedJitter = typeof jitter === "number" ? Math.random() * jitter - jitter / 2 : 0;
const availableAt = new Date(scheduledAt.getTime() + appliedJitter);

const enqueued = await this.enqueueOnce({
id: identifier,
Expand All @@ -715,6 +714,8 @@ class Worker<TCatalog extends WorkerCatalog> {
scheduledAt,
enqueued,
availableAt,
appliedJitter,
jitter,
});

return {
Expand Down