wake worker on job change
This commit is contained in:
1 parent
08e9c02a3a
commit
3b919044e6
6 files changed
+149
-9
No files matched your search
@@ -479,6 +479,80 @@ describe("DBQueueWorker", () => {
|
||||
});
|
||||
});
|
||||
|
||||
// ── poll backoff + wake() ───────────────────────────────────────────────────
|
||||
//
|
||||
// An idle loop grows its poll interval up to POLL_MAX_MS (5s). wake() fast-paths
|
||||
// it back so a freshly-enqueued "run now" job doesn't wait out that backoff.
|
||||
|
||||
describe("poll backoff and wake", () => {
|
||||
const POLL_MAX_MS = 5000;
|
||||
const claims = (mocks: any, type: string) => mocks.jobsRepository.claimDueBatch.mock.calls.filter((c: any[]) => c[0] === type).length;
|
||||
|
||||
it("backs off the idle poll interval toward POLL_MAX_MS", async () => {
|
||||
const { mocks } = await start({ queueMode: "worker" }); // claimDueBatch returns [] → always idle
|
||||
await jest.advanceTimersByTimeAsync(15000); // let the check loop grow to the cap
|
||||
const before = claims(mocks, "check");
|
||||
await jest.advanceTimersByTimeAsync(POLL_MAX_MS * 2); // ~2 polls at a 5s cadence
|
||||
const delta = claims(mocks, "check") - before;
|
||||
// At the cap that's ~2 polls; at the un-backed-off 250ms cadence it would be ~40.
|
||||
expect(delta).toBeGreaterThanOrEqual(1);
|
||||
expect(delta).toBeLessThanOrEqual(4);
|
||||
});
|
||||
|
||||
it("wake() re-fires an idle, backed-off loop immediately", async () => {
|
||||
const { worker, mocks } = await start({ queueMode: "worker" });
|
||||
await jest.advanceTimersByTimeAsync(15000); // back off the check loop to the cap
|
||||
const before = claims(mocks, "check");
|
||||
|
||||
worker.wake("check");
|
||||
await jest.advanceTimersByTimeAsync(1);
|
||||
|
||||
expect(claims(mocks, "check")).toBe(before + 1); // fired now, not 5s later
|
||||
});
|
||||
|
||||
it("wake() resets the cadence so the loop polls fast again, not at the 5s cap", async () => {
|
||||
const { worker, mocks } = await start({ queueMode: "worker" });
|
||||
await jest.advanceTimersByTimeAsync(15000); // backed off to the cap
|
||||
worker.wake("check");
|
||||
await jest.advanceTimersByTimeAsync(1); // immediate tick (still idle → next poll at ~POLL_MS*2)
|
||||
const before = claims(mocks, "check");
|
||||
|
||||
await jest.advanceTimersByTimeAsync(POLL_MS * 2); // 500ms
|
||||
|
||||
// Polled again well within the old 5s cap, proving the interval was reset.
|
||||
expect(claims(mocks, "check")).toBe(before + 1);
|
||||
});
|
||||
|
||||
it("wake() is a no-op for a loop that isn't running in this process", async () => {
|
||||
const { worker, mocks } = await start({ queueMode: "primary", queuePrimaryProcesses: false }); // no loops
|
||||
expect(() => worker.wake("check")).not.toThrow();
|
||||
await jest.advanceTimersByTimeAsync(1);
|
||||
expect(claims(mocks, "check")).toBe(0);
|
||||
});
|
||||
|
||||
it("addJob wakes the check loop so a new monitor's first check runs promptly", async () => {
|
||||
const { worker, mocks } = await start({ queueMode: "worker" });
|
||||
await jest.advanceTimersByTimeAsync(15000); // backed off to the cap
|
||||
const before = claims(mocks, "check");
|
||||
|
||||
await worker.addJob("m2", makeMonitor({ id: "m2" }));
|
||||
await jest.advanceTimersByTimeAsync(1);
|
||||
|
||||
expect(claims(mocks, "check")).toBe(before + 1);
|
||||
});
|
||||
|
||||
it("resumeJob wakes the check loop so a resumed monitor runs promptly", async () => {
|
||||
const { worker, mocks } = await start({ queueMode: "worker" });
|
||||
await jest.advanceTimersByTimeAsync(15000); // backed off to the cap
|
||||
const before = claims(mocks, "check");
|
||||
|
||||
await worker.resumeJob(makeMonitor());
|
||||
await jest.advanceTimersByTimeAsync(1);
|
||||
|
||||
expect(claims(mocks, "check")).toBe(before + 1);
|
||||
});
|
||||
});
|
||||
|
||||
// ── shutdown ────────────────────────────────────────────────────────────────
|
||||
|
||||
describe("shutdown", () => {
|
||||
|
||||
@@ -3,6 +3,7 @@ import { MaintenanceWindowService } from "../../../src/domain/maintenance-window
|
||||
import type { IMaintenanceWindowsRepository } from "../../../src/domain/maintenance-windows/maintenance-window.repository.interface.ts";
|
||||
import type { IMonitorsRepository } from "../../../src/domain/monitors/monitor.repository.interface.ts";
|
||||
import type { IJobsRepository } from "../../../src/domain/jobs/job.repository.interface.ts";
|
||||
import type { IWorker } from "../../../src/worker/worker.interface.ts";
|
||||
import type { MaintenanceWindow } from "../../../src/domain/maintenance-windows/maintenance-window.type.ts";
|
||||
|
||||
// ── Helpers ──────────────────────────────────────────────────────────────────
|
||||
@@ -33,16 +34,23 @@ const createJobsRepo = () =>
|
||||
markMonitorsDue: jest.fn().mockResolvedValue(0),
|
||||
}) as unknown as jest.Mocked<IJobsRepository>;
|
||||
|
||||
const createWorker = () =>
|
||||
({
|
||||
wake: jest.fn(),
|
||||
}) as unknown as jest.Mocked<IWorker>;
|
||||
|
||||
const createService = (overrides?: {
|
||||
monitorsRepository?: ReturnType<typeof createMonitorsRepo>;
|
||||
maintenanceWindowsRepository?: ReturnType<typeof createMaintenanceWindowsRepo>;
|
||||
jobsRepository?: ReturnType<typeof createJobsRepo>;
|
||||
worker?: ReturnType<typeof createWorker>;
|
||||
}) => {
|
||||
const monitorsRepository = overrides?.monitorsRepository ?? createMonitorsRepo();
|
||||
const maintenanceWindowsRepository = overrides?.maintenanceWindowsRepository ?? createMaintenanceWindowsRepo();
|
||||
const jobsRepository = overrides?.jobsRepository ?? createJobsRepo();
|
||||
const service = new MaintenanceWindowService({ monitorsRepository, maintenanceWindowsRepository, jobsRepository });
|
||||
return { service, monitorsRepository, maintenanceWindowsRepository, jobsRepository };
|
||||
const worker = overrides?.worker ?? createWorker();
|
||||
const service = new MaintenanceWindowService({ monitorsRepository, maintenanceWindowsRepository, jobsRepository, worker });
|
||||
return { service, monitorsRepository, maintenanceWindowsRepository, jobsRepository, worker };
|
||||
};
|
||||
|
||||
const makeWindow = (overrides?: Partial<MaintenanceWindow>): MaintenanceWindow => ({
|
||||
@@ -275,7 +283,7 @@ describe("MaintenanceWindowService", () => {
|
||||
it("flips covered monitors to initializing when deleting an active window", async () => {
|
||||
const maintenanceWindowsRepository = createMaintenanceWindowsRepo();
|
||||
(maintenanceWindowsRepository.deleteById as jest.Mock).mockResolvedValue(makeActiveWindow({ monitorIds: ["mon-1", "mon-2"] }));
|
||||
const { service, monitorsRepository, jobsRepository } = createService({ maintenanceWindowsRepository });
|
||||
const { service, monitorsRepository, jobsRepository, worker } = createService({ maintenanceWindowsRepository });
|
||||
|
||||
await service.deleteMaintenanceWindow({ id: "mw-1", teamId: "team-1" });
|
||||
|
||||
@@ -283,6 +291,19 @@ describe("MaintenanceWindowService", () => {
|
||||
expect(monitorsRepository.updateByIds).toHaveBeenCalledWith(["mon-1", "mon-2"], "team-1", { status: "initializing" }, ["paused"]);
|
||||
// Monitors leaving maintenance are re-armed to run soon instead of waiting out the interval
|
||||
expect(jobsRepository.markMonitorsDue).toHaveBeenCalledWith(["mon-1", "mon-2"], expect.any(Number));
|
||||
// ...and the idle loops are woken so the re-armed jobs run promptly
|
||||
expect(worker.wake).toHaveBeenCalledWith("check");
|
||||
expect(worker.wake).toHaveBeenCalledWith("geo-check");
|
||||
});
|
||||
|
||||
it("does not wake the loops when no monitor leaves maintenance", async () => {
|
||||
const maintenanceWindowsRepository = createMaintenanceWindowsRepo();
|
||||
(maintenanceWindowsRepository.deleteById as jest.Mock).mockResolvedValue(makeWindow({ active: false, monitorIds: ["mon-1"] }));
|
||||
const { service, worker } = createService({ maintenanceWindowsRepository });
|
||||
|
||||
await service.deleteMaintenanceWindow({ id: "mw-1", teamId: "team-1" });
|
||||
|
||||
expect(worker.wake).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("excludes the deleted window from the overlap check", async () => {
|
||||
|
||||
Reference in new issue
Block a user