-
Notifications
You must be signed in to change notification settings - Fork 31
containers: Fix alarm scheduler spinloop under concurrent callers #191
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.
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
Open
quantizor
wants to merge
2
commits into
cloudflare:main
Choose a base branch
from
quantizor:fix/alarm-scheduler-spinloop
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| --- | ||
| '@cloudflare/containers': patch | ||
| --- | ||
|
|
||
| Fix a spinloop in the alarm scheduler that could saturate the Durable Object event loop and cause WebSocket upgrades to be canceled at 0ms wallclock while HTTP traffic to the same DO continued to succeed. The `alarm()` handler previously paired an in-memory `setTimeout` sleep with an unconditional `setAlarm(Date.now())` on exit. Any external call to `scheduleNextAlarm()` during the sleep resolved the internal Promise, and the handler's exit path would then overwrite the caller's future alarm with one scheduled for "now" — causing the runtime to refire the alarm immediately. Under load (for example, a `startAndWaitForPorts` retry loop or partysocket reconnect storm), this escalated into a ~300ms alarm cadence matching `INSTANCE_POLL_INTERVAL_MS`. | ||
|
|
||
| The handler is now durable-by-default: it completes its work and re-arms the storage alarm to the earliest of the next scheduled task, `sleepAfter` expiration, or a 3-minute heartbeat, floored at 100ms. `scheduleNextAlarm()` is idempotent — concurrent callers converge on the earliest requested time instead of clobbering each other via the removed in-memory Promise/timeout coordination. | ||
|
|
||
| No behavior change for activity renewal, connection handling, or `onStart`/`onStop` lifecycle hooks. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,17 @@ | ||
| module.exports = { | ||
| preset: 'ts-jest', | ||
| testEnvironment: 'node', | ||
| testMatch: ['**/tests/**/*.test.ts'], | ||
| testMatch: ['**/src/tests/**/*.test.ts'], | ||
| moduleFileExtensions: ['ts', 'js', 'json'], | ||
| moduleNameMapper: { | ||
| '^cloudflare:workers$': '<rootDir>/src/tests/__mocks__/cloudflare-workers.ts' | ||
| }, | ||
| transform: { | ||
| '^.+\\.ts$': ['ts-jest', { tsconfig: 'tsconfig.json' }] | ||
| }, | ||
| clearMocks: true, | ||
| collectCoverage: true, | ||
| coverageDirectory: 'coverage', | ||
| coverageReporters: ['text', 'lcov'], | ||
| collectCoverageFrom: ['src/**/*.ts', '!src/**/*.d.ts'] | ||
| }; | ||
| collectCoverageFrom: ['src/**/*.ts', '!src/**/*.d.ts', '!src/tests/**'] | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /** | ||
| * Jest mock for the `cloudflare:workers` virtual module. Provides stub | ||
| * implementations of DurableObject and WorkerEntrypoint good enough to | ||
| * let Container / ContainerProxy class bodies compile and run under | ||
| * Node + ts-jest without a real workerd runtime. | ||
| */ | ||
|
|
||
| export class DurableObject<Env = unknown> { | ||
| ctx: unknown; | ||
| env: Env; | ||
| constructor(ctx: unknown, env: Env) { | ||
| this.ctx = ctx; | ||
| this.env = env; | ||
| } | ||
| } | ||
|
|
||
| export class WorkerEntrypoint<Env = unknown, _Props = unknown> { | ||
| ctx: unknown; | ||
| env: Env; | ||
| constructor(ctx: unknown, env: Env) { | ||
| this.ctx = ctx; | ||
| this.env = env; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right now the Durable Object being active keeps the container lifetime. I am curious to see if we remove this, we won't be able to keep the container alive for an amount of time specified by sleepAfter.