fix(thumbnails): two defects the copy test exposed
1. Per-file overrides must beat the content tier in RAM as well as on
disk. The content-keyed lookup ran first, so a thumbnail already
rendered from the file's content sat in RAM under content(blob_hash)
and shadowed a preview uploaded afterwards — permanently. Invisible
before the moka rekey, because both lived under one file-id key and
the upload simply overwrote the render. Order is now uniform:
per-file RAM, per-file disk (ext-), per-file DB, then content RAM,
blob-hash disk, derived blob.
2. store_attached_blob never wrote a row. Its RETURNING clause compared
the stored hash against EXCLUDED, and PostgreSQL only permits
EXCLUDED in the SET and WHERE of DO UPDATE — a runtime syntax error
on every call. The superseded hash now comes from a SELECT taken
before the upsert; losing that race leaves one stale reference, which
the manifest recompute reports, rather than anything being lost.
The second hid behind the first for a whole cycle, and behind
`ext-{file_id}.jpg`: the ORIGINAL kept serving its uploaded preview from
local disk, so the feature looked healthy. Only a copy, which has a
different file_id and therefore no ext- file, depends on the row — and
the row was never there. The handler's best-effort warn! completed the
disguise, so it is now error!: a failure there means copies silently
lose the preview, and nothing else signals it.
This commit is contained in:
@@ -550,19 +550,22 @@ impl ThumbnailService {
|
||||
// today's behaviour, which is what the port impl wants.
|
||||
dedup: Option<&DedupService>,
|
||||
) -> Option<Bytes> {
|
||||
// 1. Check in-memory cache.
|
||||
// A file-specific override beats anything derived from the content,
|
||||
// and that has to hold at EVERY tier — including RAM. Checking the
|
||||
// content-keyed entry first would let a previously-rendered
|
||||
// thumbnail shadow a preview the user has since uploaded: the render
|
||||
// is cached under `content(hash)`, the upload lands under
|
||||
// `external(file_id)`, and the content key would win forever.
|
||||
//
|
||||
// Keyed by content, so a caller that did not resolve the hash cannot
|
||||
// consult this tier — it falls through to disk, which is correct
|
||||
// rather than merely acceptable: a file-id key would be the stale
|
||||
// entry the content key exists to avoid. Every HTTP path passes the
|
||||
// hash (both handlers resolve it to build the ETag), so the fall
|
||||
// through is confined to internal callers that never had one.
|
||||
if let Some(hash) = blob_hash
|
||||
&& let Some(bytes) = self
|
||||
.cache
|
||||
.get(&ThumbnailCacheKey::content(hash, size, format))
|
||||
.await
|
||||
// So the order is: per-file RAM, per-file disk, per-file DB, then the
|
||||
// content-keyed tiers. Same precedence as the disk tiers below, just
|
||||
// applied one level up.
|
||||
|
||||
// 1. Per-file override in RAM (uploaded preview / video frame).
|
||||
if let Some(bytes) = self
|
||||
.cache
|
||||
.get(&ThumbnailCacheKey::external(file_id, size))
|
||||
.await
|
||||
&& !bytes.is_empty()
|
||||
{
|
||||
return Some(bytes);
|
||||
@@ -612,8 +615,26 @@ impl ThumbnailService {
|
||||
return Some(bytes);
|
||||
}
|
||||
|
||||
// 3. Check disk for blob-hash thumbnails (needs blob_hash to locate)
|
||||
// 3. Content-keyed RAM tier. Below the per-file tiers by the rule
|
||||
// above; still ahead of every disk read.
|
||||
//
|
||||
// A caller that did not resolve the hash cannot consult it and
|
||||
// falls through to disk. That is correct rather than merely
|
||||
// acceptable: a file-id key here would be the stale entry content
|
||||
// keying exists to avoid. Both HTTP handlers resolve the hash to
|
||||
// build the ETag, so the fall-through is confined to internal
|
||||
// callers that never had one.
|
||||
let hash = blob_hash?;
|
||||
if let Some(bytes) = self
|
||||
.cache
|
||||
.get(&ThumbnailCacheKey::content(hash, size, format))
|
||||
.await
|
||||
&& !bytes.is_empty()
|
||||
{
|
||||
return Some(bytes);
|
||||
}
|
||||
|
||||
// 4. Check disk for blob-hash thumbnails (needs blob_hash to locate)
|
||||
let thumb_path = self.get_thumbnail_path(hash, size, format);
|
||||
if let Ok(data) = fs::read(&thumb_path).await {
|
||||
let bytes = Bytes::from(data);
|
||||
|
||||
Reference in New Issue
Block a user