fix(gallery): a missing thumbnail tier must not take the backend down (#1128)
The first load of a gallery whose ?w= tiers do not exist yet could exit the Node process — not 500 one tile, kill the backend. Two defects stacked. The reader: LocalFsStorage.get() returns a lazy fs.createReadStream, so an ENOENT arrives after the await returned and outside the route's try/catch. An unhandled 'error' event is a process-level throw. pipeStreamToResponse attaches the handler the routes were missing — 404 for a vanished source, connection destroyed if bytes are already on the wire, file headers cleared so the JSON error is not served as image/jpeg or cached as a broken tile for an hour. Applied to all nine streaming responses in gallery.js. The writer: ensureThumbnailAtWidth passed regenerate:true, whose first act is to DELETE the target — on a path only reached when the tier is absent. A grid fires one request per tile, so one request unlinked the file another had just published and handed to a reader. Without the flag the write is an atomic rename. Generation is now also deduped per tier key: 8 concurrent requests ran 5 Sharp passes before, 1 after. Reported with a full diagnosis by @BraynArts.
This commit is contained in:
@@ -784,6 +784,12 @@ async function deleteThumbnailTiers(photo) {
|
||||
* served from a cache hit without re-reading the source, so an unscoped key
|
||||
* would hand one gallery's photo to another.
|
||||
*/
|
||||
/**
|
||||
* Tier storage key -> the in-flight generation for it (#1128). Module scope so
|
||||
* every concurrent request for one tile shares a single Sharp pass.
|
||||
*/
|
||||
const inFlightThumbnailTiers = new Map();
|
||||
|
||||
async function ensureThumbnailAtWidth(photo, width) {
|
||||
if (!width) return ensureThumbnail(photo);
|
||||
|
||||
@@ -835,28 +841,60 @@ async function ensureThumbnailAtWidth(photo, width) {
|
||||
// would visibly reframe as the tile size changes.
|
||||
const height = Math.round(width * (settings.height / canonicalWidth));
|
||||
|
||||
try {
|
||||
if (isExternal) {
|
||||
const localPath = resolvePhotoFilePath(event, photo);
|
||||
return await generateThumbnail(localPath, {
|
||||
regenerate: true, outputBasename, width, height,
|
||||
});
|
||||
}
|
||||
const sourceKey = resolvePhotoStorageKey(event, photo);
|
||||
if (!sourceKey) return null;
|
||||
return await withLocalCopy(sourceKey, async (localPath) => {
|
||||
const proc = await withProcessableImage(localPath, sourceKey);
|
||||
try {
|
||||
return await generateThumbnail(proc.path, {
|
||||
regenerate: true, outputBasename, width, height,
|
||||
});
|
||||
} finally {
|
||||
proc.cleanup();
|
||||
// One generation per tier key, however many tiles ask for it (#1128).
|
||||
//
|
||||
// A grid issues one request per tile simultaneously, and on a cold gallery
|
||||
// every one of them misses the stat above. Without this each would run its
|
||||
// own Sharp pass over the same source — and for an external photo, re-read
|
||||
// the whole original off the NFS mount to do it. 79 tiles meant 79 decodes
|
||||
// of the same file, which is also what made the delete race easy to hit.
|
||||
//
|
||||
// Per-process only. Two pods still generate independently, which is
|
||||
// harmless: the write ends in an atomic rename, so they converge on
|
||||
// byte-identical output.
|
||||
const pending = inFlightThumbnailTiers.get(key);
|
||||
if (pending) return pending;
|
||||
|
||||
const work = (async () => {
|
||||
try {
|
||||
// NOT `regenerate: true` (#1128). This path is only reached on a cache
|
||||
// MISS, so there is nothing to regenerate — but that flag makes
|
||||
// generateThumbnail open by DELETING the target. Request A publishes the
|
||||
// tier, B stats it and heads for storage.get(), and C — still inside
|
||||
// generation from its own earlier miss — unlinks the file B is about to
|
||||
// open. B's lazy ReadStream then raised an ENOENT nothing was listening
|
||||
// for and Node exited.
|
||||
//
|
||||
// Without the flag the write is a plain put: LocalFsStorage stages to a
|
||||
// temp file and renames, which is atomic, so a concurrent reader sees
|
||||
// either the old file or the new one and never a hole.
|
||||
if (isExternal) {
|
||||
const localPath = resolvePhotoFilePath(event, photo);
|
||||
return await generateThumbnail(localPath, { outputBasename, width, height });
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
logger.warn(`Thumbnail tier w${width} failed for photo ${photo.id}: ${e.message}`);
|
||||
return null;
|
||||
const sourceKey = resolvePhotoStorageKey(event, photo);
|
||||
if (!sourceKey) return null;
|
||||
return await withLocalCopy(sourceKey, async (localPath) => {
|
||||
const proc = await withProcessableImage(localPath, sourceKey);
|
||||
try {
|
||||
return await generateThumbnail(proc.path, { outputBasename, width, height });
|
||||
} finally {
|
||||
proc.cleanup();
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
logger.warn(`Thumbnail tier w${width} failed for photo ${photo.id}: ${e.message}`);
|
||||
return null;
|
||||
}
|
||||
})();
|
||||
|
||||
inFlightThumbnailTiers.set(key, work);
|
||||
try {
|
||||
return await work;
|
||||
} finally {
|
||||
// In a finally so a rejection cannot poison the key for the process
|
||||
// lifetime — the next request re-attempts rather than adopting a failure.
|
||||
inFlightThumbnailTiers.delete(key);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user