[Fizz] Avoid hanging when suspending after aborting while rendering #34192
+57
−5
Conversation
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
github-actions
bot
added
the
React Core Team
|
Comparing: 0422a00...f1589a3 Critical size changesIncludes critical production bundles, as well as any change greater than 2%:
Significant size changesIncludes any change greater than 0.2%: (No significant changes) |
gnoff
force-pushed
the
fix-fizz-suspend-after-abort
branch
from
6d7133b to
a7a9639
Compare
This fixes an edge case where you abort the render while rendering a component that ends up Suspending. It technically only applied if you were deep enough to be inside `renderNode` and was not susceptible to hanging if the abort + suspending component was being tried inside retryRenderTask/retryReplaytask. The fix is to preempt the thenable checks in renderNode and check if the request is aborting and if so just bubble up to the task handler. The reason this hung before is a new task would get scheduled after we had aborted every other task (minus the currently rendering one). This led to a situation where the task count would not hit zero.
gnoff
force-pushed
the
fix-fizz-suspend-after-abort
branch
from
a7a9639 to
f1589a3
Compare
sebmarkbage
approved these changes
Aug 12, 2025
github-actions bot
pushed a commit
that referenced
this pull request
Aug 12, 2025
…34192) This fixes an edge case where you abort the render while rendering a component that ends up Suspending. It technically only applied if you were deep enough to be inside `renderNode` and was not susceptible to hanging if the abort + suspending component was being tried inside retryRenderTask/retryReplaytask. The fix is to preempt the thenable checks in renderNode and check if the request is aborting and if so just bubble up to the task handler. The reason this hung before is a new task would get scheduled after we had aborted every other task (minus the currently rendering one). This led to a situation where the task count would not hit zero. DiffTrain build for [9baecbf](9baecbf)
gnoff
pushed a commit
to vercel/next.js
that referenced
this pull request
Aug 13, 2025
[diff facebook/react@1dc3bdea...f1222f76](facebook/react@1dc3bde...f1222f7) <details> <summary>React upstream changes</summary> - facebook/react#34183 - facebook/react#34192 - facebook/react#34186 - facebook/react#34187 </details>
This was referenced Oct 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This fixes an edge case where you abort the render while rendering a component that ends up Suspending. It technically only applied if you were deep enough to be inside
renderNodeand was not susceptible to hanging if the abort + suspending component was being tried inside retryRenderTask/retryReplaytask.The fix is to preempt the thenable checks in renderNode and check if the request is aborting and if so just bubble up to the task handler.
The reason this hung before is a new task would get scheduled after we had aborted every other task (minus the currently rendering one). This led to a situation where the task count would not hit zero.