Skip to content
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

Fixed stale fetch using when page regenerates #58926

Merged
merged 6 commits into from
Nov 29, 2023

Conversation

hallatore
Copy link
Contributor

@hallatore hallatore commented Nov 26, 2023

fixes: #58909
x-ref: #58321, #56472, #56231

Removed the Math.round of age since it can cause stale fetch data to be considered not stale if the age rounds downwards. (5.49 is rounded to 5)

Note: This most likely also fixes some bugs with revalidateTag/revalidatePath. Tested some tag/path issues that got fixed with this change.
I think this is because revalidatetag/path sets data.revalidatedAt = Date.now() for file-system-cache. And with the current code that value would continue to be "not stale" for up to 0.499 ms.

ijjk
ijjk previously approved these changes Nov 27, 2023
Copy link
Member

@ijjk ijjk left a comment

Choose a reason for hiding this comment

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

Removing the rounding here makes sense to me and since this is probably super hard to test seems alright to not require a new case for this specific change, thanks!

ztanner
ztanner previously approved these changes Nov 27, 2023
@ijjk
Copy link
Member

ijjk commented Nov 27, 2023

Tests Passed

@ijjk
Copy link
Member

ijjk commented Nov 27, 2023

Stats from current PR

Default Build
General
vercel/next.js canary hallatore/next.js revalidate_fix Change
buildDuration 10.3s 10.1s N/A
buildDurationCached 5.8s 5.9s N/A
nodeModulesSize 199 MB 199 MB N/A
nextStartRea..uration (ms) 420ms 423ms N/A
Client Bundles (main, webpack)
vercel/next.js canary hallatore/next.js revalidate_fix Change
199-HASH.js gzip 28.7 kB 28.7 kB N/A
3f784ff6-HASH.js gzip 53.3 kB 53.3 kB
494.HASH.js gzip 180 B 181 B N/A
framework-HASH.js gzip 45.2 kB 45.2 kB
main-app-HASH.js gzip 241 B 238 B N/A
main-HASH.js gzip 31.7 kB 31.7 kB N/A
webpack-HASH.js gzip 1.7 kB 1.7 kB
Overall change 100 kB 100 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary hallatore/next.js revalidate_fix Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary hallatore/next.js revalidate_fix Change
_app-HASH.js gzip 194 B 195 B N/A
_error-HASH.js gzip 182 B 181 B N/A
amp-HASH.js gzip 501 B 503 B N/A
css-HASH.js gzip 322 B 323 B N/A
dynamic-HASH.js gzip 2.5 kB 2.5 kB
edge-ssr-HASH.js gzip 253 B 255 B N/A
head-HASH.js gzip 348 B 347 B N/A
hooks-HASH.js gzip 369 B 368 B N/A
image-HASH.js gzip 4.27 kB 4.27 kB N/A
index-HASH.js gzip 256 B 256 B
link-HASH.js gzip 2.61 kB 2.6 kB N/A
routerDirect..HASH.js gzip 311 B 311 B
script-HASH.js gzip 384 B 383 B N/A
withRouter-HASH.js gzip 307 B 308 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 3.17 kB 3.17 kB
Client Build Manifests
vercel/next.js canary hallatore/next.js revalidate_fix Change
_buildManifest.js gzip 484 B 483 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary hallatore/next.js revalidate_fix Change
index.html gzip 528 B 528 B
link.html gzip 540 B 541 B N/A
withRouter.html gzip 524 B 523 B N/A
Overall change 528 B 528 B
Edge SSR bundle Size
vercel/next.js canary hallatore/next.js revalidate_fix Change
edge-ssr.js gzip 92.5 kB 92.5 kB N/A
page.js gzip 145 kB 145 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary hallatore/next.js revalidate_fix Change
middleware-b..fest.js gzip 625 B 626 B N/A
middleware-r..fest.js gzip 150 B 151 B N/A
middleware.js gzip 35.6 kB 35.6 kB N/A
edge-runtime..pack.js gzip 1.92 kB 1.92 kB
Overall change 1.92 kB 1.92 kB
Next Runtimes
vercel/next.js canary hallatore/next.js revalidate_fix Change
app-page-exp...dev.js gzip 167 kB 167 kB
app-page-exp..prod.js gzip 93.5 kB 93.5 kB
app-page-tur..prod.js gzip 94.3 kB 94.3 kB
app-page-tur..prod.js gzip 88.8 kB 88.8 kB
app-page.run...dev.js gzip 137 kB 137 kB
app-page.run..prod.js gzip 88.2 kB 88.2 kB
app-route-ex...dev.js gzip 23.8 kB 23.8 kB
app-route-ex..prod.js gzip 16.5 kB 16.5 kB
app-route-tu..prod.js gzip 16.5 kB 16.5 kB
app-route-tu..prod.js gzip 16 kB 16 kB
app-route.ru...dev.js gzip 23.2 kB 23.2 kB
app-route.ru..prod.js gzip 16 kB 16 kB
pages-api-tu..prod.js gzip 9.37 kB 9.37 kB
pages-api.ru...dev.js gzip 9.64 kB 9.64 kB
pages-api.ru..prod.js gzip 9.37 kB 9.37 kB
pages-turbo...prod.js gzip 21.9 kB 21.9 kB
pages.runtim...dev.js gzip 22.5 kB 22.5 kB
pages.runtim..prod.js gzip 21.9 kB 21.9 kB
server.runti..prod.js gzip 49.2 kB 49.2 kB N/A
Overall change 876 kB 876 kB
Diff details
Diff for page.js

Diff too large to display

Diff for edge-ssr.js

Diff too large to display

Diff for server.runtime.prod.js

Diff too large to display

Commit: 77b7cb5

@acdlite acdlite dismissed stale reviews from ztanner and ijjk via d1fb38b November 27, 2023 16:32
@hallatore
Copy link
Contributor Author

@leerob I noticed #42290 and #49417. Hope this might resolve some of those issues.

@ijjk ijjk merged commit ca19ffb into vercel:canary Nov 29, 2023
53 of 58 checks passed
@hallatore hallatore deleted the revalidate_fix branch November 29, 2023 06:42
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ISR revalidation is using stale data
3 participants