mirror of
https://github.com/navidrome/navidrome.git
synced 2026-07-10 01:28:50 +00:00
Some checks are pending
Pipeline: Test, Lint, Build / Upload Linux PKG (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Get version info (push) Waiting to run
Pipeline: Test, Lint, Build / Lint Go code (push) Waiting to run
Pipeline: Test, Lint, Build / Test Go code (push) Waiting to run
Pipeline: Test, Lint, Build / Test Go code (Windows) (push) Waiting to run
Pipeline: Test, Lint, Build / Test JS code (push) Waiting to run
Pipeline: Test, Lint, Build / Lint i18n files (push) Waiting to run
Pipeline: Test, Lint, Build / Check Docker configuration (push) Waiting to run
Pipeline: Test, Lint, Build / Build (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-1 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-2 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-3 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-4 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build Windows installers (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-5 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-6 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-7 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-8 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Package/Release (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-9 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-10 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Push to GHCR (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Push to Docker Hub (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Cleanup digest artifacts (push) Blocked by required conditions
* feat(cache): add completion marker helpers to spreadFS * feat(cache): write completion marker after successful cache write * fix(cache): adopt only complete files on reload, grandfather existing caches * test(cache): regression tests for partial-transcode crash leftover (#5636) * test(cache): guard concurrent in-progress streaming with completion marker * test(cache): make concurrent-streaming guard actually attach a second reader mid-write The previous test obtained s2 only after pw.Close(), so no reader ever attached to the in-progress entry. Now pw.Write("hello ") is called synchronously before the second Get — io.Pipe's blocking write gives a deterministic happens-before — then both s1 and s2 are drained in parallel goroutines while the producer writes the rest and closes the pipe. * style(cache): clarify best-effort intent of cleanup os.Remove calls * refactor(cache): lift one-time grandfather pass out of Reload's steady-state loop * refactor(cache): have MarkComplete take the key, owning path mapping in spreadFS * test(cache): assert no completion marker is written when the write fails * refactor(cache): rename migration sentinel to generic .nd-migrated * refactor(cache): rename grandfather migration to migrateExistingFiles * refactor(cache): single-pass Reload with safer marker-error handling Address PR review feedback: - Merge the one-time migration into Reload's single directory walk, avoiding a second full walk on first boot. - Only delete a data file when its marker is definitively absent (os.IsNotExist); skip on other stat errors to avoid destroying valid entries under transient I/O failures. - Write the migration sentinel only after a clean walk, so a partial walk can't strand valid-but-unmarked files for later deletion. - Return early from walkDataFiles on a WalkDir error. - Assert fs.Create error in the marker-removal test.
186 lines
6.1 KiB
Go
186 lines
6.1 KiB
Go
package cache
|
|
|
|
import (
|
|
"crypto/sha1"
|
|
"fmt"
|
|
"io/fs"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/djherbis/atime"
|
|
"github.com/djherbis/fscache"
|
|
"github.com/djherbis/stream"
|
|
"github.com/navidrome/navidrome/log"
|
|
)
|
|
|
|
const completeMarkerSuffix = ".complete"
|
|
const sentinelName = ".nd-migrated"
|
|
|
|
type spreadFS struct {
|
|
root string
|
|
mode os.FileMode
|
|
init func() error
|
|
}
|
|
|
|
// NewSpreadFS returns a FileSystem rooted at directory dir. This FS hashes the key and
|
|
// distributes all files in a layout like XX/XX/XXXXXXXXXX. Ex:
|
|
//
|
|
// Key is abc123.300x300.jpg
|
|
// Hash would be: c574aeb3caafcf93ee337f0cf34e31a428ba3f13
|
|
// File in cache would be: c5 / 74 / c574aeb3caafcf93ee337f0cf34e31a428ba3f13
|
|
//
|
|
// The idea is to avoid having too many files in one dir, which could potentially cause performance issues
|
|
// and may hit limitations depending on the OS.
|
|
// See discussion here: https://github.com/djherbis/fscache/issues/8#issuecomment-614319323
|
|
//
|
|
// dir is created with specified mode if it doesn't exist.
|
|
func NewSpreadFS(dir string, mode os.FileMode) (*spreadFS, error) {
|
|
f := &spreadFS{root: dir, mode: mode, init: func() error {
|
|
return os.MkdirAll(dir, mode)
|
|
}}
|
|
return f, f.init()
|
|
}
|
|
|
|
func (sfs *spreadFS) Reload(f func(key string, name string)) error {
|
|
// On the first run after upgrade (no sentinel yet), pre-existing files have
|
|
// no completion marker. Migrate them instead of discarding them as partials,
|
|
// so a user's whole cache isn't wiped. After the sentinel exists, an unmarked
|
|
// file is a crash partial and is discarded.
|
|
sentinel := filepath.Join(sfs.root, sentinelName)
|
|
_, sErr := os.Stat(sentinel)
|
|
migrating := os.IsNotExist(sErr)
|
|
|
|
count := 0
|
|
err := sfs.walkDataFiles(func(absoluteFilePath string) {
|
|
if _, statErr := os.Stat(sfs.markerPath(absoluteFilePath)); statErr != nil {
|
|
switch {
|
|
case migrating:
|
|
if mErr := sfs.MarkComplete(absoluteFilePath); mErr != nil {
|
|
log.Warn("Error migrating cache file", "file", absoluteFilePath, mErr)
|
|
}
|
|
case os.IsNotExist(statErr):
|
|
// No completion marker: this is a partial left by a crash. Discard it.
|
|
log.Debug("Removing incomplete cache file", "file", absoluteFilePath)
|
|
_ = os.Remove(absoluteFilePath) //nolint:gosec // best-effort cleanup; re-swept on next Reload
|
|
return
|
|
default:
|
|
// Marker may exist but is unreadable (transient I/O, permissions):
|
|
// skip adoption without destroying a possibly-valid entry.
|
|
log.Warn("Error reading cache completion marker", "file", absoluteFilePath, statErr)
|
|
return
|
|
}
|
|
}
|
|
f(absoluteFilePath, absoluteFilePath)
|
|
count++
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
log.Debug("Loaded cache", "dir", sfs.root, "numItems", count)
|
|
// Only record the migration as done after a clean walk, so a partial walk
|
|
// doesn't leave valid-but-unmarked files to be discarded on the next run.
|
|
if migrating {
|
|
if wErr := os.WriteFile(sentinel, nil, 0600); wErr != nil {
|
|
log.Warn("Error writing cache migration sentinel", "file", sentinel, wErr)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// walkDataFiles visits every cache data file (named XX/XX/<40-hex>), skipping
|
|
// completion markers and opportunistically cleaning up orphaned ones.
|
|
func (sfs *spreadFS) walkDataFiles(visit func(absoluteFilePath string)) error {
|
|
return filepath.WalkDir(sfs.root, func(absoluteFilePath string, _ fs.DirEntry, err error) error {
|
|
if err != nil {
|
|
log.Error("Error loading cache", "dir", sfs.root, err)
|
|
return nil
|
|
}
|
|
path, err := filepath.Rel(sfs.root, absoluteFilePath)
|
|
if err != nil {
|
|
return nil //nolint:nilerr
|
|
}
|
|
|
|
// Skip marker files; also clean orphan markers (data file gone).
|
|
if strings.HasSuffix(path, completeMarkerSuffix) {
|
|
dataPath := strings.TrimSuffix(absoluteFilePath, completeMarkerSuffix)
|
|
if _, statErr := os.Stat(dataPath); os.IsNotExist(statErr) {
|
|
_ = os.Remove(absoluteFilePath) //nolint:gosec // best-effort cleanup; re-swept on next Reload
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Skip if name is not in the format XX/XX/XXXXXXXXXXXX
|
|
parts := strings.Split(path, string(os.PathSeparator))
|
|
if len(parts) != 3 || len(parts[0]) != 2 || len(parts[1]) != 2 || len(parts[2]) != 40 {
|
|
return nil
|
|
}
|
|
|
|
visit(absoluteFilePath)
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func (sfs *spreadFS) Create(name string) (stream.File, error) {
|
|
path := filepath.Dir(name)
|
|
err := os.MkdirAll(path, sfs.mode)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
|
|
}
|
|
|
|
func (sfs *spreadFS) Open(name string) (stream.File, error) {
|
|
return os.Open(name)
|
|
}
|
|
|
|
func (sfs *spreadFS) markerPath(dataPath string) string {
|
|
return dataPath + completeMarkerSuffix
|
|
}
|
|
|
|
// MarkComplete records that the cache entry for key was written in full.
|
|
// Only files with a marker are adopted on the next Reload; this is what
|
|
// distinguishes a complete cache entry from a partial one left by a crash.
|
|
// key may be an original cache key or an already-mapped data path; KeyMapper
|
|
// is idempotent for the latter (see KeyMapper).
|
|
func (sfs *spreadFS) MarkComplete(key string) error {
|
|
f, err := os.OpenFile(sfs.markerPath(sfs.KeyMapper(key)), os.O_CREATE|os.O_WRONLY, 0600)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return f.Close()
|
|
}
|
|
|
|
func (sfs *spreadFS) Remove(name string) error {
|
|
if err := os.Remove(sfs.markerPath(name)); err != nil && !os.IsNotExist(err) {
|
|
log.Warn("Error removing cache completion marker", "file", name, err)
|
|
}
|
|
return os.Remove(name)
|
|
}
|
|
|
|
func (sfs *spreadFS) Stat(name string) (fscache.FileInfo, error) {
|
|
stat, err := os.Stat(name)
|
|
if err != nil {
|
|
return fscache.FileInfo{}, err
|
|
}
|
|
return fscache.FileInfo{FileInfo: stat, Atime: atime.Get(stat)}, nil
|
|
}
|
|
|
|
func (sfs *spreadFS) RemoveAll() error {
|
|
if err := os.RemoveAll(sfs.root); err != nil {
|
|
return err
|
|
}
|
|
return sfs.init()
|
|
}
|
|
|
|
func (sfs *spreadFS) KeyMapper(key string) string {
|
|
// When running the Haunter, fscache can call this KeyMapper with the cached filepath instead of the key.
|
|
// That's because we don't inform the original cache keys when reloading in the Reload function above.
|
|
// If that's the case, just return the file path, as it is the actual mapped key.
|
|
if strings.HasPrefix(key, sfs.root) {
|
|
return key
|
|
}
|
|
hash := fmt.Sprintf("%x", sha1.Sum([]byte(key)))
|
|
return filepath.Join(sfs.root, hash[0:2], hash[2:4], hash)
|
|
}
|