-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
feat(caching) Release registry caching #15339
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
sergical
wants to merge
33
commits into
master
Choose a base branch
from
sergical/cache-issues
base: master
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
Show all changes
33 commits
Select commit
Hold shift + click to select a range
0c2799d
feat(caching) try with 2 workers on enhanced build
sergical 79ac993
testing with more workers
sergical 6bc7aae
75% workers
sergical 52dee11
test 1 worker
sergical 865b223
caching release registry
sergical 8565372
bring back 75% cpu
sergical e968968
back to half
sergical 98d867c
registry cache logs
sergical c163037
lets test file changes
sergical 4f15275
revert content changes
sergical 5e97f5a
cleanup old cache files
sergical 4011531
lint
sergical 4cc99d1
delete if not used
sergical 95385be
worker cleanup
sergical bef41c2
[getsentry/action-github-commit] Auto commit
getsantry[bot] 6e8ad91
address byk's comments
sergical e803adc
Fix merge conflict resolution: use cacheKey condition instead of skip…
sergical aa5dc16
Remove error cache reset - cache failures so worker fails fast
sergical 5116b55
Add debug logging for cache tracking
sergical 64ed4c0
[getsentry/action-github-commit] Auto commit
getsantry[bot] 9e33c13
Add detailed debug logging for cache cleanup
sergical 95af6ef
[getsentry/action-github-commit] Auto commit
getsantry[bot] 6a793f2
Add overlap detection and cache miss debugging
sergical 529e692
[getsentry/action-github-commit] Auto commit
getsantry[bot] 577e9d4
Add detailed cache hit/miss stats and initial cache size
sergical 4683bcf
[getsentry/action-github-commit] Auto commit
getsantry[bot] b041698
Add detection for non-deterministic HTML patterns
sergical cefcb46
[getsentry/action-github-commit] Auto commit
getsantry[bot] bd569ac
Fix cache by normalizing timestamps and Next.js asset hashes
sergical eba9346
Revert hasty fix and add proper debugging
sergical 3b93727
Output debug info to build logs instead of file
sergical 28b6431
Save leanHTML samples locally for debugging
sergical 77e937b
keep testing
sergical 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 |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ import imgLinks from '@pondorasti/remark-img-links'; | |
| import {selectAll} from 'hast-util-select'; | ||
| import {createHash} from 'node:crypto'; | ||
| import {createReadStream, createWriteStream, existsSync} from 'node:fs'; | ||
| import {mkdir, opendir, readFile, rm, writeFile} from 'node:fs/promises'; | ||
| import {mkdir, opendir, readdir, readFile, rm, writeFile} from 'node:fs/promises'; | ||
| import {cpus} from 'node:os'; | ||
| import * as path from 'node:path'; | ||
| import {compose, Readable} from 'node:stream'; | ||
|
|
@@ -58,7 +58,20 @@ async function uploadToCFR2(s3Client, relativePath, data) { | |
| return; | ||
| } | ||
|
|
||
| function taskFinishHandler({id, success, failedTasks}) { | ||
| // Global set to track which cache files are used across all workers | ||
| let globalUsedCacheFiles = null; | ||
|
|
||
| function taskFinishHandler({id, success, failedTasks, usedCacheFiles}) { | ||
| // Collect cache files used by this worker into the global set | ||
| if (usedCacheFiles && globalUsedCacheFiles) { | ||
| console.log(`🔍 Worker[${id}]: returned ${usedCacheFiles.length} cache files.`); | ||
| usedCacheFiles.forEach(file => globalUsedCacheFiles.add(file)); | ||
| } else { | ||
| console.warn( | ||
| `⚠️ Worker[${id}]: usedCacheFiles=${!!usedCacheFiles}, globalUsedCacheFiles=${!!globalUsedCacheFiles}` | ||
| ); | ||
| } | ||
|
|
||
| if (failedTasks.length === 0) { | ||
| console.log(`✅ Worker[${id}]: converted ${success} files successfully.`); | ||
| return false; | ||
|
|
@@ -93,8 +106,16 @@ async function createWork() { | |
| if (noCache) { | ||
| console.log(`ℹ️ No cache directory found, this will take a while...`); | ||
| await mkdir(CACHE_DIR, {recursive: true}); | ||
| } else { | ||
| const initialCacheFiles = await readdir(CACHE_DIR); | ||
| console.log( | ||
| `📦 Cache directory has ${initialCacheFiles.length} files from previous build` | ||
| ); | ||
| } | ||
|
|
||
| // Track which cache files are used during this build | ||
| globalUsedCacheFiles = new Set(); | ||
|
|
||
| // On a 16-core machine, 8 workers were optimal (and slightly faster than 16) | ||
| const numWorkers = Math.max(Math.floor(cpus().length / 2), 2); | ||
| const workerTasks = new Array(numWorkers).fill(null).map(() => []); | ||
|
|
@@ -175,12 +196,14 @@ async function createWork() { | |
| }); | ||
| }); | ||
| // The main thread can also process tasks -- That's 65% more bullet per bullet! -Cave Johnson | ||
| const mainThreadUsedFiles = new Set(); | ||
| workerPromises.push( | ||
| processTaskList({ | ||
| id: workerTasks.length - 1, | ||
| tasks: workerTasks[workerTasks.length - 1], | ||
| cacheDir: CACHE_DIR, | ||
| noCache, | ||
| usedCacheFiles: mainThreadUsedFiles, | ||
| }).then(data => { | ||
| if (taskFinishHandler(data)) { | ||
| throw new Error(`Worker[${data.id}] had some errors.`); | ||
|
|
@@ -190,13 +213,42 @@ async function createWork() { | |
|
|
||
| await Promise.all(workerPromises); | ||
|
|
||
| // Clean up unused cache files to prevent unbounded growth | ||
| if (!noCache) { | ||
| try { | ||
| const allFiles = await readdir(CACHE_DIR); | ||
| const filesToDelete = allFiles.filter(file => !globalUsedCacheFiles.has(file)); | ||
| const overlaps = allFiles.filter(file => globalUsedCacheFiles.has(file)); | ||
|
|
||
| console.log(`📊 Cache tracking stats:`); | ||
| console.log(` - Files in cache dir (after build): ${allFiles.length}`); | ||
| console.log(` - Files tracked as used: ${globalUsedCacheFiles.size}`); | ||
| console.log(` - Files that existed and were used: ${overlaps.length}`); | ||
| console.log(` - Files to delete (old/unused): ${filesToDelete.length}`); | ||
| console.log(` - Expected after cleanup: ${overlaps.length} files`); | ||
|
|
||
| if (filesToDelete.length > 0) { | ||
| await Promise.all( | ||
| filesToDelete.map(file => rm(path.join(CACHE_DIR, file), {force: true})) | ||
| ); | ||
| console.log(`🧹 Cleaned up ${filesToDelete.length} unused cache files`); | ||
| } | ||
|
|
||
| // Verify cleanup worked | ||
| const remainingFiles = await readdir(CACHE_DIR); | ||
| console.log(`✅ Cache directory now has ${remainingFiles.length} files`); | ||
| } catch (err) { | ||
| console.warn('Failed to clean unused cache files:', err); | ||
| } | ||
| } | ||
|
|
||
| console.log(`📄 Generated ${numFiles} markdown files from HTML.`); | ||
| console.log('✅ Markdown export generation complete!'); | ||
| } | ||
|
|
||
| const md5 = data => createHash('md5').update(data).digest('hex'); | ||
|
|
||
| async function genMDFromHTML(source, target, {cacheDir, noCache}) { | ||
| async function genMDFromHTML(source, target, {cacheDir, noCache, usedCacheFiles}) { | ||
| const leanHTML = (await readFile(source, {encoding: 'utf8'})) | ||
| // Remove all script tags, as they are not needed in markdown | ||
| // and they are not stable across builds, causing cache misses | ||
|
|
@@ -210,6 +262,11 @@ async function genMDFromHTML(source, target, {cacheDir, noCache}) { | |
| ); | ||
| await writeFile(target, data, {encoding: 'utf8'}); | ||
|
|
||
| // Track that we used this cache file | ||
| if (usedCacheFiles) { | ||
| usedCacheFiles.add(cacheKey); | ||
| } | ||
|
|
||
| return {cacheHit: true, data}; | ||
| } catch (err) { | ||
| if (err.code !== 'ENOENT') { | ||
|
|
@@ -304,10 +361,20 @@ async function genMDFromHTML(source, target, {cacheDir, noCache}) { | |
| ).catch(err => console.warn('Error writing cache file:', err)), | ||
| ]); | ||
|
|
||
| // Track that we created this cache file | ||
| if (usedCacheFiles) { | ||
| usedCacheFiles.add(cacheKey); | ||
| } | ||
|
|
||
| return {cacheHit: false, data}; | ||
| } | ||
|
|
||
| async function processTaskList({id, tasks, cacheDir, noCache}) { | ||
| async function processTaskList({id, tasks, cacheDir, noCache, usedCacheFiles}) { | ||
| // Workers don't receive usedCacheFiles in workerData, so create a new Set | ||
| if (!usedCacheFiles) { | ||
| usedCacheFiles = new Set(); | ||
| } | ||
|
|
||
| const s3Client = getS3Client(); | ||
| const failedTasks = []; | ||
| let cacheMisses = []; | ||
|
|
@@ -318,6 +385,7 @@ async function processTaskList({id, tasks, cacheDir, noCache}) { | |
| const {data, cacheHit} = await genMDFromHTML(sourcePath, targetPath, { | ||
| cacheDir, | ||
| noCache, | ||
| usedCacheFiles, | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Bug: Worker Initialization Missing Cache SetWorker threads are initialized without a Additional Locations (1) |
||
| }); | ||
| if (!cacheHit) { | ||
| cacheMisses.push(relativePath); | ||
|
|
@@ -345,6 +413,11 @@ async function processTaskList({id, tasks, cacheDir, noCache}) { | |
| `📤 Worker[${id}]: Updated the following files on R2: \n${r2CacheMisses.map(n => ` - ${n}`).join('\n')}` | ||
| ); | ||
| } | ||
| const cacheHits = success - cacheMisses.length; | ||
| console.log( | ||
| `📈 Worker[${id}]: Cache stats: ${cacheHits} hits, ${cacheMisses.length} misses (${((cacheMisses.length / success) * 100).toFixed(1)}% miss rate)` | ||
| ); | ||
|
|
||
| if (cacheMisses.length / tasks.length > 0.1) { | ||
| console.warn(`⚠️ Worker[${id}]: More than 10% cache miss rate during build.`); | ||
| } else if (cacheMisses.length > 0) { | ||
|
|
@@ -357,6 +430,7 @@ async function processTaskList({id, tasks, cacheDir, noCache}) { | |
| id, | ||
| success, | ||
| failedTasks, | ||
| usedCacheFiles: Array.from(usedCacheFiles), | ||
| }; | ||
| } | ||
|
|
||
|
|
||
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
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.
Bug: Cache Miss Handling Fails
The cache cleanup logic immediately deletes newly created cache files. When
genMDFromHTMLgenerates a cache file due to a miss, it doesn't add the file's key to theusedCacheFilesset. This prevents the cache from being effective for those files in subsequent builds.Additional Locations (1)
scripts/generate-md-exports.mjs#L211-L216There 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.
This looks legit?