fix(cloudflare): avoid repeated flush lock wrapping#21156
Merged
logaretm merged 3 commits intoMay 26, 2026
Merged
Conversation
logaretm
changed the title
logaretm
requested review from
JPeer264 and
andreiborza
and removed request for
a team
Contributor
size-limit report 📦
|
JPeer264
approved these changes
May 26, 2026
Member
JPeer264
left a comment
JPeer264
left a comment
There was a problem hiding this comment.
Looks great. I also added a memory test to ensure we not introduce any other memory leaks in the future by accident
logaretm
deleted the
awad/js-2605-makeflushlock-grows-a-waituntil-wrapper-chain-on-every-init
branch
47 tasks
JPeer264
added a commit
that referenced
this pull request
May 28, 2026
) follow up to: #21156 This prevents a deadlock in the `waitUntil`, which happened in the sentry-mcp: <img width="972" height="119" alt="Screenshot 2026-05-27 at 17 04 19" src="https://github.com/user-attachments/assets/18ec0f64-c766-4f6f-82a6-9453280668a5" />
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Durable Objects can reuse the same instrumented context across many requests.
makeFlushLock()replacedcontext.waitUntilon every init, so each request wrapped the previous wrapper and built an unbounded call chain.A later
waitUntil()call then had to recurse through every wrapper, eventually causing stack overflows and retaining stale closures.I added a mechanism to reuse a single
waitUntilwrapper per Cloudflare context instead of wrapping again on every SDK init. Also added a regression coverage for long-lived contexts repeatedly creating flush locks.Fixes #21150