73efb091d9
gates / gates (push) Successful in 9s
appbackup's path helpers take a NAMESPACE ROOT. Five call sites passed a bare DRIVE path.
On an enrolled drive the two coincide, so nothing showed; on the system-data fallback they
differ by exactly the felhom-data segment, and the app then bound a directory the off-site
capture set never looked at -- while the run reported ok. Measured live on demo-hp: the app
wrote to /mnt/sys_drive/userdata/media/books, the capture set looked for
/mnt/sys_drive/felhom-data/userdata/media/books.
THE RULE NOW HAS ONE EXPRESSION. appbackup.NamespaceRootFor / IsEnrolledDrive encode the
drive-kind comparison; backup.Manager.namespaceRoot and stacks.Manager.inGuest delegate to
it. There were already TWO copies and they differed -- the backup package's compared without
filepath.Clean, the stacks package's with it, so a trailing slash from config would have
flipped the mode in one and not the other.
Sites routed through it:
- stacks/deploy.go withPathVars -> ${USERDATA_PATH} (the live defect)
- appexport/fabplan.go + export.go (via a new provider method)
- web/handlers.go FileBrowser mounts (latent: the system drive is
deliberately never a registered StoragePath, so this is the identity today)
ComputeFabBuckets now receives the namespace root, which is what ComputeCaptureSet has always
received -- so the export's classified paths and the backup's capture set describe the same
directories by construction instead of by coincidence.
Tests are table-driven over BOTH drive kinds, because this survived by being invisible on the
kind that already worked. Red-proofs observed: restoring the bare-path call fails the
system-drive row with the two paths differing by /felhom-data; inverting the drive-kind
comparison fails every enrolled row.
164 lines
5.7 KiB
Go
164 lines
5.7 KiB
Go
package backup
|
|
|
|
// This file bridges the backup package to internal/appbackup, where the
|
|
// self-contained app-data backup primitives (DB dump, Docker-volume archive
|
|
// discovery, keep-side path helpers) now live. The backup package keeps these
|
|
// names available — via type/const aliases and thin function forwarders — so
|
|
// the (still present) delete-side code and the both-side consumers (web, api,
|
|
// report) compile unchanged. Behaviour is identical: the forwarders call
|
|
// straight through to appbackup.
|
|
//
|
|
// Go has no function aliasing, so the functions are one-line forwarders while
|
|
// the types/consts use real aliases.
|
|
|
|
import (
|
|
"context"
|
|
"log"
|
|
"time"
|
|
|
|
"gitea.dooplex.hu/admin/felhom-controller/internal/appbackup"
|
|
)
|
|
|
|
// --- type aliases (appdata) ---
|
|
|
|
type StackDataProvider = appbackup.StackDataProvider
|
|
type StackSummary = appbackup.StackSummary
|
|
type AppBackupInfo = appbackup.AppBackupInfo
|
|
type AppDataPath = appbackup.AppDataPath
|
|
type AppDockerVolume = appbackup.AppDockerVolume
|
|
type RecoveryInfo = appbackup.RecoveryInfo
|
|
type ClassifiedBind = appbackup.ClassifiedBind
|
|
|
|
// --- type aliases (dbdump) ---
|
|
|
|
type DBType = appbackup.DBType
|
|
type DiscoveredDB = appbackup.DiscoveredDB
|
|
type DumpResult = appbackup.DumpResult
|
|
type DumpValidation = appbackup.DumpValidation
|
|
type DumpFileInfo = appbackup.DumpFileInfo
|
|
|
|
// --- const aliases ---
|
|
|
|
const (
|
|
DBTypePostgres = appbackup.DBTypePostgres
|
|
DBTypeMariaDB = appbackup.DBTypeMariaDB
|
|
)
|
|
|
|
// Backup-classification class constants (Task 3-core) — aliased so the tier engines can switch on
|
|
// class without importing appbackup directly.
|
|
const (
|
|
ClassMandatory = appbackup.ClassMandatory
|
|
ClassOptional = appbackup.ClassOptional
|
|
ClassExcluded = appbackup.ClassExcluded
|
|
)
|
|
|
|
// FelhomDataDir is the namespace directory on storage drives for all felhom-managed data.
|
|
const FelhomDataDir = appbackup.FelhomDataDir
|
|
|
|
// --- function forwarders (dbdump) ---
|
|
|
|
func DiscoverDatabases(ctx context.Context, logger *log.Logger, debug bool, knownStacks []string) ([]DiscoveredDB, error) {
|
|
return appbackup.DiscoverDatabases(ctx, logger, debug, knownStacks)
|
|
}
|
|
|
|
func DumpAll(ctx context.Context, dbs []DiscoveredDB, dumpDir string, logger *log.Logger, debug bool) []DumpResult {
|
|
return appbackup.DumpAll(ctx, dbs, dumpDir, logger, debug)
|
|
}
|
|
|
|
func DumpOne(ctx context.Context, db DiscoveredDB, dumpDir string, logger *log.Logger, debug bool) DumpResult {
|
|
return appbackup.DumpOne(ctx, db, dumpDir, logger, debug)
|
|
}
|
|
|
|
// ImportDump replays a captured .sql dump back into a running DB container (F17 restore path).
|
|
func ImportDump(ctx context.Context, db DiscoveredDB, dumpPath string, logger *log.Logger, debug bool) error {
|
|
return appbackup.ImportDump(ctx, db, dumpPath, logger, debug)
|
|
}
|
|
|
|
func ValidateDump(filePath string, dbType DBType) DumpValidation {
|
|
return appbackup.ValidateDump(filePath, dbType)
|
|
}
|
|
|
|
func ListDumpFiles(dumpDir string, cached func(name string, size int64, mod time.Time) (DumpValidation, bool)) ([]DumpFileInfo, error) {
|
|
return appbackup.ListDumpFiles(dumpDir, cached)
|
|
}
|
|
|
|
// --- function forwarders (appdata) ---
|
|
|
|
func DiscoverAppData(provider StackDataProvider, discoveredDBs []DiscoveredDB) []AppBackupInfo {
|
|
return appbackup.DiscoverAppData(provider, discoveredDBs)
|
|
}
|
|
|
|
func ParseComposeNamedVolumes(composePath string) []AppDockerVolume {
|
|
return appbackup.ParseComposeNamedVolumes(composePath)
|
|
}
|
|
|
|
func ResolveDockerVolumeNames(composePath string) []string {
|
|
return appbackup.ResolveDockerVolumeNames(composePath)
|
|
}
|
|
|
|
func ParseComposeImages(composePath string) []string {
|
|
return appbackup.ParseComposeImages(composePath)
|
|
}
|
|
|
|
// DBServiceNames forwards to appbackup.DBServiceNames — the compose SERVICE names holding a database,
|
|
// i.e. the argument list for the DB-only bring-up both restore paths use before a dump replay (R-47).
|
|
func DBServiceNames(composePath string) ([]string, error) {
|
|
return appbackup.DBServiceNames(composePath)
|
|
}
|
|
|
|
// humanizeBytes forwards to appbackup.HumanizeBytes; kept unexported so the
|
|
// many in-package call sites (backup.go, crossdrive.go, restore code) need no edit.
|
|
func humanizeBytes(b int64) string {
|
|
return appbackup.HumanizeBytes(b)
|
|
}
|
|
|
|
// --- function forwarders (paths) ---
|
|
//
|
|
// NOTE: the path helpers below take a felhom-data NAMESPACE ROOT, not a bare drive path. Use
|
|
// NamespaceRoot (or Manager.namespaceRoot / Manager.AppNamespaceRoot) to resolve the root first.
|
|
|
|
func NamespaceRoot(drivePath string, inGuestDrive bool) string {
|
|
return appbackup.NamespaceRoot(drivePath, inGuestDrive)
|
|
}
|
|
|
|
// NamespaceRootFor re-exports the ONE drive-kind-aware resolver (R-203).
|
|
func NamespaceRootFor(drivePath, systemDataPath string) string {
|
|
return appbackup.NamespaceRootFor(drivePath, systemDataPath)
|
|
}
|
|
|
|
func PrimaryBackupPath(nsRoot string) string {
|
|
return appbackup.PrimaryBackupPath(nsRoot)
|
|
}
|
|
|
|
func AppDBDumpPath(nsRoot, stackName string) string {
|
|
return appbackup.AppDBDumpPath(nsRoot, stackName)
|
|
}
|
|
|
|
func AppVolumeDumpPath(nsRoot, stackName string) string {
|
|
return appbackup.AppVolumeDumpPath(nsRoot, stackName)
|
|
}
|
|
|
|
func RecoveryUnitPath(nsRoot, stackName string) string {
|
|
return appbackup.RecoveryUnitPath(nsRoot, stackName)
|
|
}
|
|
|
|
func RecoveryUnitComposePath(nsRoot, stackName string) string {
|
|
return appbackup.RecoveryUnitComposePath(nsRoot, stackName)
|
|
}
|
|
|
|
func RecoveryUnitManifestPath(nsRoot, stackName string) string {
|
|
return appbackup.RecoveryUnitManifestPath(nsRoot, stackName)
|
|
}
|
|
|
|
func AppDataDir(nsRoot, stackName string) string {
|
|
return appbackup.AppDataDir(nsRoot, stackName)
|
|
}
|
|
|
|
func AppDataDirNames(hddPath, stackName string, hddMounts []string) []string {
|
|
return appbackup.AppDataDirNames(hddPath, stackName, hddMounts)
|
|
}
|
|
|
|
func AppDataBindsPresent(hddPath string, hddMounts []string) bool {
|
|
return appbackup.AppDataBindsPresent(hddPath, hddMounts)
|
|
}
|