Skip to content

[Cache Components] Dev - fix hanging cache deadlock #85077

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

Draft
wants to merge 2 commits into
base: canary
Choose a base branch
from
+321 −160
Draft

[Cache Components] Dev - fix hanging cache deadlock #85077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afe9d0d
fixing hanging cache deadlock
lubieowoce Oct 17, 2025
66c194a
make cache omission/delay consistent
lubieowoce Oct 18, 2025
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
17 changes: 12 additions & 5 deletions packages/next/src/server/app-render/app-render.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,7 @@ async function renderWithRestartOnCacheMissInDev(
initialRequestStore: RequestStore,
createRequestStore: () => RequestStore,
getPayload: (requestStore: RequestStore) => Promise<RSCPayload>,
onError: (error: unknown) => void
onError: (err: unknown) => string | undefined
) {
const {
htmlRequestId,
Expand Down Expand Up @@ -2842,9 +2842,9 @@ async function renderWithRestartOnCacheMissInDev(
const prerenderResumeDataCache = createPrerenderResumeDataCache()

const initialReactController = new AbortController()
const initialDataController = new AbortController() // Controls hanging promises we create
const initialHangingPromiseController = new AbortController()
Copy link
Member Author

@lubieowoce lubieowoce Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a rename to make it clearer what it's for

const initialStageController = new StagedRenderingController(
initialDataController.signal
initialHangingPromiseController.signal
)

requestStore.prerenderResumeDataCache = prerenderResumeDataCache
Expand Down Expand Up @@ -2873,7 +2873,13 @@ async function renderWithRestartOnCacheMissInDev(
initialRscPayload,
clientReferenceManifest.clientModules,
{
onError,
onError: (err) => {
if (initialReactController.signal.aborted) {
return undefined
} else {
return onError(err)
}
},
environmentName,
filterStackFrame,
debugChannel: debugChannel?.serverSide,
Expand All @@ -2884,7 +2890,8 @@ async function renderWithRestartOnCacheMissInDev(
// Note that we want to install this listener after the render is started
// so that it runs after react is finished running its abort code.
initialReactController.signal.addEventListener('abort', () => {
initialDataController.abort(initialReactController.signal.reason)
const { reason } = initialReactController.signal
initialHangingPromiseController.abort(reason)
})
return stream
},
Expand Down
9 changes: 8 additions & 1 deletion packages/next/src/server/dynamic-rendering-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function makeHangingPromise<T>(
expression: string
): Promise<T> {
if (signal.aborted) {
return Promise.reject(new HangingPromiseRejectionError(route, expression))
return makeRejectedHangingPromise(route, expression)
} else {
const hangingPromise = new Promise<T>((_, reject) => {
const boundRejection = reject.bind(
Expand Down Expand Up @@ -74,6 +74,13 @@ export function makeHangingPromise<T>(
}
}

export function makeRejectedHangingPromise(
route: string,
expression: string
): Promise<never> {
return Promise.reject(new HangingPromiseRejectionError(route, expression))
}

function ignoreReject() {}

export function makeDevtoolsIOAwarePromise<T>(
Expand Down
Loading
Loading