Delete metadata directories a backup left without a manifest (closes #390)

A backup that stopped between uploading db.zst.age and its manifest
left that directory under metadata/ on the destination for good:
prune deleted nothing there.

The blob step of prune, which snapshot create --prune also runs, now
deletes each directory under metadata/ that has no manifest.json.zst,
that no local snapshot record claims, and all of whose objects are
older than prune_grace_period; an object listed with no time keeps its
directory, and only names that are remote keys are deleted. The prompt
and the --force output name each such directory, the --json result
counts them (metadata_dirs_deleted, metadata_dirs_failed), and a failed
delete fails the run. Every description of the grace period now
covers these directories.

Model: opus-5-5

ARCHITECTURE.md

@@ -312,7 +312,7 @@ Repository interfaces:
 ```
 CreateSnapshot(opts)
     │
-    ├─► markDestination()   // Check the marker (see Storage Layout in S3), then write it
+    ├─► markDestination()   // Refuse a destination without the marker, then write it
     │
     ├─► PruneDatabase()   // Critical: avoid dedup errors
     │
@@ -382,20 +382,15 @@ bucket/
         └── manifest.json.zst        # Blob list (for pruning/verification)
 ```
 
-A destination that answers a look-up of `vaultik-destination.txt` with not
+A destination without `vaultik-destination.txt` is treated as not present
-found is treated as not present while the local index holds snapshots stored
+while the local index holds snapshots stored there (`checkDestinationMarker`
-there (`checkDestinationMarker` in `internal/vaultik/destination_marker.go`):
+in `internal/vaultik/destination_marker.go`): `snapshot create` refuses to
-`snapshot create` refuses to write to it, `prune`, `snapshot purge` and
+write to it, `prune`, `snapshot purge` and `remote nuke` fail, and
-`remote nuke` fail, and `snapshot list` and `snapshot remove` behave as for a
+`snapshot list` and `snapshot remove` behave as for a destination that cannot
-destination that cannot be listed. This keeps those commands from taking an
+be listed. This keeps those commands from taking an unplugged volume's empty
-unplugged volume's empty mount point for a destination whose snapshots are
+mount point for a destination whose snapshots are all gone. The `file://`
-all gone. When the look-up fails for any reason other than not found, for
+backend never creates its destination directory, so a write to a missing one
-example when S3 refuses it to credentials that allow only PUT, the check is
+fails.
-skipped, so a host with such credentials does not notice an emptied
-destination; see
-[docs/REPOSTRUCTURE.md](docs/REPOSTRUCTURE.md#marker-file-vaultik-destinationtxt).
-The `file://` backend never creates its destination directory, so a write to a
-missing one fails.
 
 The `{remote-key}` directory name is a one-way double SHA-256 hash of the human
 snapshot ID, so the human ID (hostname, snapshot name, timestamp) is never

README.md

@@ -330,36 +330,15 @@ value where a list belongs or a word where a number belongs), is refused.
   `--skip-errors` skipped a file or directory it could not read or list, the
   prune does not run and every older snapshot is kept, since one of them may
   be the only one that holds what was skipped; the command says so and exits
-  non-zero. When the backup found nothing in a configured path, as in the
+  non-zero. A file removed during the backup does not stop the prune.
-  mount point of a volume that is not mounted, the prune does not run
-  either: every older snapshot is kept, and the command names the path and
-  exits non-zero, on every run until the path holds something again. Take a
-  path that is empty on purpose out of the config, or remove the older
-  snapshots by hand with `snapshot purge`. When an earlier snapshot of the
-  same name in the local index found a volume mounted at or below a
-  configured path (a directory on a different filesystem from its parent,
-  with an entry in it that the backup does not exclude) and this backup does
-  not, the prune does not run either: every older snapshot is kept, and the
-  command names the directory and exits non-zero, on every run until the
-  volume is mounted again. A backup also does not find the volume when it
-  finds no such entry in its directory, as when an automounted volume cannot
-  be mounted, or when that directory is no longer backed up, because it is
-  excluded or its configured path was removed. If any of this is on purpose,
-  as for a retired volume, remove the older snapshots by hand with
-  `snapshot purge`. A file removed during the backup does not stop the
-  prune.
 * `--keep-newer-than <duration>`: With `--prune`, keep snapshots newer than
   this duration instead of only the latest (e.g. `4w`, `30d`, `6mo`, `1y`).
   Without `--prune`, or with a value that is not a valid duration, the
   command fails before the backup starts.
 * Fails before it writes anything when a `file://` destination directory
   does not exist, or when the local index holds snapshots and the
-  destination answers that it has no `vaultik-destination.txt`. When that
+  destination has no `vaultik-destination.txt` (see
-  look-up fails for any reason other than not found, for example when S3
-  refuses it to credentials that allow only PUT, the check is skipped (see
   [remote storage layout](#remote-storage-layout))
-* Fails, before anything is pruned, when a configured path is a symlink
-  whose target does not exist, as one into a volume that is not mounted
 
 **`snapshot list`**: Show every snapshot known to this host — the union
 of the local index and the backup destination store — with timestamps
@@ -394,9 +373,9 @@ gives: revert the configuration, or run `vaultik database delete`.
 If the destination store cannot be listed (unmounted volume,
 permission denied, network down), the command warns, falls back to the
 local index alone, and still exits zero. It does the same when the
-destination answers that it has no `vaultik-destination.txt` while the
+destination has no `vaultik-destination.txt` while the local index
-local index holds snapshots stored there, as when a volume mounted at
+holds snapshots stored there, as when a volume mounted at the
-the destination is unplugged and leaves its empty mount point behind.
+destination is unplugged and leaves its empty mount point behind.
 * `--json`: Output in JSON format. Each entry carries `locally_tracked`
   (whether the snapshot is in the local index), `remote_key` (the full
   64-character storage key), and `remote_present` (whether it was seen
@@ -439,8 +418,8 @@ with `--local-only`, the snapshot must be in the local index. Local row
 cleanup (files, chunks, blobs the snapshot was the last referrer for)
 runs automatically. If removing the snapshot's metadata from the
 destination store fails (for example because the store is unreachable,
-or the local index holds snapshots and the destination answers that it
+or the local index holds snapshots and the destination has no
-has no `vaultik-destination.txt`), the local-DB removal still completes and a
+`vaultik-destination.txt`), the local-DB removal still completes and a
 warning is emitted; run `vaultik snapshot remove <snapshot-id>` again
 once the store is reachable to remove the snapshot's metadata from it
 (`vaultik prune` does not). For a snapshot that is only on the
@@ -488,9 +467,9 @@ not a remote key is left alone. Step (3) reads all remote manifests — network
 cost scales with the number of snapshots.
 `snapshot create --prune` runs the same cleanup automatically; this is the
 manual entry point for the same work. If the destination store cannot
-be listed, or the local index holds snapshots and the destination answers
+be listed, or the local index holds snapshots and the destination has
-that it has no `vaultik-destination.txt` (an unplugged volume's empty mount
+no `vaultik-destination.txt` (an unplugged volume's empty mount point),
-point), prune fails and deletes nothing. `snapshot purge` does the same. If a
+prune fails and deletes nothing. `snapshot purge` does the same. If a
 blob or such a directory cannot be deleted, the command (and
 `snapshot create --prune`) exits non-zero.
 * `--force`: Skip confirmation prompt
@@ -527,8 +506,8 @@ and irreversible. This is the single supported way to wipe the entire
 destination store. A snapshot is removed from the local index only once
 its metadata is deleted from the destination store. If the destination
 store cannot be listed, or the local index holds snapshots and the
-destination answers that it has no `vaultik-destination.txt` (an unplugged
+destination has no `vaultik-destination.txt` (an unplugged volume's
-volume's empty mount point), the command fails before it removes anything. If a
+empty mount point), the command fails before it removes anything. If a
 listing afterwards still finds anything under `metadata/` or `blobs/`,
 the command names each object left and exits non-zero; running it again
 deletes what is left.
@@ -611,22 +590,15 @@ For an implementation-level view of the internals — the data model, the
 ```
 
 * `vaultik-destination.txt` holds one fixed line of text, with no host
-  name, path or time. While the local index holds snapshots stored
+  name, path or time. A destination without it is treated as not
-  there, a destination that answers a look-up of it with not found is
+  present while the local index holds snapshots stored there:
-  treated as not present: `snapshot create` refuses to write to it,
+  `snapshot create` refuses to write to it, `prune`, `snapshot purge`
-  `prune`, `snapshot purge` and `remote nuke` fail, and `snapshot list`
+  and `remote nuke` fail, and `snapshot list` and `snapshot remove`
-  and `snapshot remove` behave as for a destination that cannot be
+  behave as for a destination that cannot be listed. This keeps an
-  listed. This keeps an unplugged volume's empty mount point from being
+  unplugged volume's empty mount point from being taken for a
-  taken for a destination whose snapshots are all gone. Mount
+  destination whose snapshots are all gone. Mount
   the volume if it is removable; if the destination was emptied on
   purpose, run `vaultik database delete` and back up again.
-  When the look-up fails for any reason other than not found, the check
-  is skipped and the command goes on. S3 refuses it on every run to
-  credentials that allow only PUT, so a host with such credentials does
-  not notice a destination emptied since its last backup, and its next
-  backup would leave out the data its local index records as already
-  stored. After the destination is emptied, run
-  `vaultik database delete` on such a host before it backs up again.
 * Blobs are two-level directory sharded using the first 4 hex chars of the blob hash
 * `db.zst.age` is a binary SQLite database (zstd compressed, age encrypted)
   containing all file metadata, chunk mappings, and relationships for the snapshot

TODO.md

@@ -24,23 +24,6 @@ owner's; a `v*` tag runs the release build in
 
 # Completed Steps
 
-- 2026-10-15: Stopped `snapshot create --prune` pruning after a backup
-  in which a volume mounted below a configured path in an earlier
-  snapshot of the same name was not mounted
-  ([issue #395](https://git.eeqj.de/sneak/vaultik/issues/395)). Such a
-  prune could delete every snapshot still holding the volume's files.
-  Each snapshot now records in the local index the directories it found
-  on a different filesystem from their parent and found an entry in that
-  the backup does not exclude.
-
-- 2026-10-14: Stopped `snapshot create --prune` pruning after a backup
-  that found nothing in a configured path
-  ([issue #388](https://git.eeqj.de/sneak/vaultik/issues/388)), as in
-  the mount point of a volume that is not mounted. Such a prune could
-  delete every snapshot still holding that path's files. A configured
-  path that is a symlink whose target is gone, as one into such a
-  volume, now fails the backup, with or without `--prune`.
-
 - 2026-10-14: Stopped `snapshot create --prune` pruning after a backup
   that skipped files it could not read
   ([issue #382](https://git.eeqj.de/sneak/vaultik/issues/382)). Such a

docs/DATAMODEL.md

@@ -153,17 +153,7 @@ Maps snapshots to the blobs they reference.
 
 **Purpose:** Tracks blob dependencies for snapshots and enables manifest generation.
 
-### 10. `snapshot_mount_points`
+### 10. `uploads`
-The directories at or below a configured path, the configured path itself included, that a snapshot's backup found an entry in and, once it had listed them, found on a different filesystem from their parent directory (a different device number), as a mount point is. An automount point whose volume cannot be mounted is not recorded, because the backup finds no entry in it.
-
-**Columns:**
-- `snapshot_id` (TEXT) - Snapshot ID (FK to snapshots.id)
-- `path` (TEXT) - Absolute path of the directory
-- PRIMARY KEY (`snapshot_id`, `path`)
-
-**Purpose:** Lets `snapshot create --prune` skip the prune when a backup does not find a mount point that an earlier snapshot of the same name found, as when the volume is not mounted.
-
-### 11. `uploads`
 Tracks blob upload metrics.
 
 **Columns:**
@@ -183,7 +173,6 @@ Tracks blob upload metrics.
    - `INSERT OR REPLACE INTO files` - Update file metadata
    - `SELECT * FROM files WHERE path = ?` - Check if file has changed
    - `INSERT INTO snapshot_files` - Add file to current snapshot
-   - `INSERT OR IGNORE INTO snapshot_mount_points` - Record each directory on a different filesystem from its parent that the walk found an entry in
 
 2. **Chunking** (for changed files)
    - `INSERT OR IGNORE INTO chunks` - Store new chunks

docs/REPOSTRUCTURE.md

@@ -27,9 +27,7 @@ The metadata subdirectory is named with the **remote key**, a one-way hash of th
 
 ## Marker File (`vaultik-destination.txt`)
 
-Every backup writes this file at the root before it uploads anything. It holds one fixed line of plain text and names no host, path or time. While the local index holds snapshots stored there, a destination that answers a look-up of the marker with not found is treated as not present: `snapshot create` refuses to write to it, and `prune`, `snapshot purge`, `snapshot remove`, `snapshot list` and `remote nuke` behave as for a destination that cannot be listed. An unplugged volume leaves an empty directory at its mount point, and without the marker that directory would read as a destination whose snapshots are all gone. `remote nuke` deletes the marker last.
+Every backup writes this file at the root before it uploads anything. It holds one fixed line of plain text and names no host, path or time. A destination without it is treated as not present while the local index holds snapshots stored there: `snapshot create` refuses to write to it, and `prune`, `snapshot purge`, `snapshot remove`, `snapshot list` and `remote nuke` behave as for a destination that cannot be listed. An unplugged volume leaves an empty directory at its mount point, and without the marker that directory would read as a destination whose snapshots are all gone. `remote nuke` deletes the marker last.
-
-When the look-up of the marker fails for any reason other than not found, the check is skipped and the command goes on. S3 refuses it on every run to credentials that allow only PUT, so a host with such credentials does not notice a destination emptied since its last backup, and its next backup would leave out the data its local index records as already stored. After the destination is emptied, run `vaultik database delete` on such a host before it backs up again.
 
 ## Blobs Directory (`blobs/`)
 

internal/cli/entry_prune_json_test.go

@@ -134,7 +134,7 @@ func writeHermeticPruneConfig(t *testing.T, seedStale bool) string {
 		seedStaleSnapshotRecord(t, indexPath)
 
 		// While the local index holds a snapshot, prune fails on a
-		// destination that answers that it has no marker.
+		// destination without the marker a backup writes.
 		require.NoError(t, os.WriteFile(
 			filepath.Join(storeDir, "vaultik-destination.txt"), nil, 0o600))
 	}

internal/cli/entry_snapshot_create_prune_test.go

@@ -1,7 +1,6 @@
 package cli //nolint:testpackage // shares runEntry and the hermetic config helpers
 
 import (
-	"context"
 	"os"
 	"path/filepath"
 	"strings"
@@ -9,7 +8,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/vaultik/internal/database"
 )
 
 // Flags of `snapshot create` used to build argument vectors below.
@@ -89,81 +87,6 @@ func TestEntrySnapshotCreateReportsPostBackupPruneFailure(t *testing.T) {
 		"the new snapshot is on the store beside the planted one")
 }
 
-// TestEntrySnapshotCreatePruneExitsNonZeroWhenSourceIsEmpty backs up,
-// empties the source directory, as a volume that is not mounted leaves
-// its mount point, and runs `snapshot create --prune`. The command exits
-// non-zero and reports the backup as completed, not as a failed snapshot
-// creation. See https://git.eeqj.de/sneak/vaultik/issues/388.
-//
-//nolint:paralleltest // replaces os.Args, os.Stdout, os.Stderr and the xdg globals
-func TestEntrySnapshotCreatePruneExitsNonZeroWhenSourceIsEmpty(t *testing.T) {
-	configPath, storeDir := writeBackupConfig(t)
-
-	code, _, _ := runEntry(t, flagConfig, configPath, cmdSnapshot, cmdCreate)
-	require.Equal(t, 0, code)
-
-	// writeBackupConfig puts the source directory beside the config file.
-	require.NoError(t, os.Remove(
-		filepath.Join(filepath.Dir(configPath), "source", "file.txt")))
-
-	code, _, stderr := runEntry(t,
-		flagConfig, configPath, cmdSnapshot, cmdCreate, flagPrune)
-
-	assert.Equal(t, 1, code)
-	assert.Contains(t, stderr,
-		"Backup completed, but 1 source path(s) were empty")
-	assert.NotContains(t, stderr, "Snapshot creation failed")
-
-	snapshots, err := os.ReadDir(filepath.Join(storeDir, "metadata"))
-	require.NoError(t, err)
-	assert.Len(t, snapshots, 2, "the older snapshot is kept")
-}
-
-// TestEntrySnapshotCreatePruneExitsNonZeroWhenMountPointIsMissing backs
-// up, records in the local index that this backup found the source
-// directory as a mount point, and runs `snapshot create --prune`, which
-// does not find it as one. The command exits non-zero, reports the
-// backup as completed, not as a failed snapshot creation, and keeps the
-// older snapshot. See https://git.eeqj.de/sneak/vaultik/issues/395.
-//
-//nolint:paralleltest // replaces os.Args, os.Stdout, os.Stderr and the xdg globals
-func TestEntrySnapshotCreatePruneExitsNonZeroWhenMountPointIsMissing(
-	t *testing.T,
-) {
-	configPath, storeDir := writeBackupConfig(t)
-
-	code, _, _ := runEntry(t, flagConfig, configPath, cmdSnapshot, cmdCreate)
-	require.Equal(t, 0, code)
-
-	// writeBackupConfig puts the source directory and the local index
-	// beside the config file.
-	dir := filepath.Dir(configPath)
-	ctx := context.Background()
-
-	db, err := database.New(ctx, filepath.Join(dir, "index.sqlite"))
-	require.NoError(t, err)
-
-	repos := database.NewRepositories(db)
-
-	backedUp, err := repos.Snapshots.GetOnlySnapshot(ctx)
-	require.NoError(t, err)
-	require.NoError(t, repos.Snapshots.AddMountPoint(ctx, nil,
-		backedUp.ID.String(), filepath.Join(dir, "source")))
-	require.NoError(t, db.Close())
-
-	code, _, stderr := runEntry(t,
-		flagConfig, configPath, cmdSnapshot, cmdCreate, flagPrune)
-
-	assert.Equal(t, 1, code)
-	assert.Contains(t, stderr, "Backup completed, but 1 mount point(s) "+
-		"an earlier snapshot recorded were not found")
-	assert.NotContains(t, stderr, "Snapshot creation failed")
-
-	snapshots, err := os.ReadDir(filepath.Join(storeDir, "metadata"))
-	require.NoError(t, err)
-	assert.Len(t, snapshots, 2, "the older snapshot is kept")
-}
-
 // writeBackupConfig builds a hermetic config with one small file in its
 // source directory and an empty destination store directory. Returns the
 // config path and the store directory.

internal/cli/entry_snapshot_purge_test.go

@@ -42,7 +42,7 @@ func TestEntrySnapshotPurgeKeepsMetadataWhenLocalIndexDeleteFails(t *testing.T)
 	seedStaleSnapshotRecord(t, indexPath)
 
 	// While the local index holds a snapshot, purge fails on a
-	// destination that answers that it has no marker.
+	// destination without the marker a backup writes.
 	require.NoError(t, os.WriteFile(
 		filepath.Join(dir, "store", "vaultik-destination.txt"), nil, 0o600))
 

internal/cli/snapshot.go

@@ -115,10 +115,8 @@ on Linux), then /etc/vaultik/config.yml.`,
 					return
 				}
 
-				if errors.Is(err, vaultik.ErrFilesUnreadable) ||
+				if errors.Is(err, vaultik.ErrFilesUnreadable) {
-					errors.Is(err, vaultik.ErrSourcePathEmpty) ||
+					log.Error("Backup completed with unreadable files", "error", err)
-					errors.Is(err, vaultik.ErrVolumeNotMounted) {
-					log.Error("Backup completed with an error", "error", err)
 					ReportErrorf("Backup completed, but %v", err)
 
 					return
@@ -138,8 +136,7 @@ on Linux), then /etc/vaultik/config.yml.`,
 			"directory under metadata/ with no manifest once all its "+
 			"objects are older than prune_grace_period and its snapshot is "+
 			"not in the local index (not after a backup that skipped "+
-			"unreadable files, found a configured path empty, or did not "+
+			"unreadable files)")
-			"find a mount point an earlier snapshot found)")
 	cmd.Flags().StringVar(&opts.KeepNewerThan, "keep-newer-than", "",
 		"With --prune: keep snapshots newer than this duration "+
 			"(e.g. 30d, 4w, 6mo, 1y; m is minutes, mo is months) "+

internal/database/schema/001.sql

@@ -123,16 +123,6 @@ CREATE TABLE IF NOT EXISTS snapshot_blobs (
 -- Index for efficient blob lookups (used in orphan detection)
 CREATE INDEX IF NOT EXISTS idx_snapshot_blobs_blob_id ON snapshot_blobs(blob_id);
 
--- Snapshot mount points table: the directories at or below a configured
--- path that the snapshot's backup found on a different filesystem from
--- their parent directory, as a mount point is, and found an entry in
-CREATE TABLE IF NOT EXISTS snapshot_mount_points (
-    snapshot_id TEXT NOT NULL,
-    path TEXT NOT NULL,
-    PRIMARY KEY (snapshot_id, path),
-    FOREIGN KEY (snapshot_id) REFERENCES snapshots(id) ON DELETE CASCADE
-);
-
 -- Uploads table: tracks blob upload metrics
 CREATE TABLE IF NOT EXISTS uploads (
     blob_hash TEXT PRIMARY KEY,

internal/database/snapshots.go

@@ -24,8 +24,7 @@ var (
 )
 
 // SnapshotRepository provides access to the snapshots table and its
-// snapshot_files / snapshot_blobs association tables, and to the mount
+// snapshot_files / snapshot_blobs association tables.
-// points each snapshot's backup found (snapshot_mount_points).
 type SnapshotRepository struct {
 	db *DB
 }
@@ -501,57 +500,27 @@ func (r *SnapshotRepository) GetBlobHashes(
 		ORDER BY sb.blob_hash
 	`
 
-	blobs, err := r.queryStrings(ctx, query, snapshotID)
+	rows, err := r.db.conn.QueryContext(ctx, query, snapshotID)
 	if err != nil {
 		return nil, fmt.Errorf("querying blob hashes: %w", err)
 	}
 
-	return blobs, nil
+	defer func() { _ = rows.Close() }()
-}
 
-// AddMountPoint records dir as a directory that the backup of a snapshot
+	var blobs []string
-// found on a different filesystem from its parent directory, as a mount
-// point is, using tx when non-nil.
-func (r *SnapshotRepository) AddMountPoint(
-	ctx context.Context, tx *sql.Tx, snapshotID string, dir string,
-) error {
-	query := `
-		INSERT OR IGNORE INTO snapshot_mount_points (snapshot_id, path)
-		VALUES (?, ?)
-	`
 
-	var err error
+	for rows.Next() {
-	if tx != nil {
+		var blobHash string
-		_, err = tx.ExecContext(ctx, query, snapshotID, dir)
+
-	} else {
+		err := rows.Scan(&blobHash)
-		_, err = r.db.ExecWithLog(ctx, query, snapshotID, dir)
+		if err != nil {
+			return nil, fmt.Errorf("scanning blob hash: %w", err)
+		}
+
+		blobs = append(blobs, blobHash)
 	}
 
-	if err != nil {
+	return blobs, rows.Err()
-		return fmt.Errorf("adding mount point to snapshot: %w", err)
-	}
-
-	return nil
-}
-
-// GetMountPoints returns the directories AddMountPoint recorded for a
-// snapshot, sorted.
-func (r *SnapshotRepository) GetMountPoints(
-	ctx context.Context, snapshotID string,
-) ([]string, error) {
-	query := `
-		SELECT path
-		FROM snapshot_mount_points
-		WHERE snapshot_id = ?
-		ORDER BY path
-	`
-
-	dirs, err := r.queryStrings(ctx, query, snapshotID)
-	if err != nil {
-		return nil, fmt.Errorf("querying mount points: %w", err)
-	}
-
-	return dirs, nil
 }
 
 // GetSnapshotTotalCompressedSize returns the total compressed size of all
@@ -740,34 +709,6 @@ func (r *SnapshotRepository) DeleteSnapshotUploads(
 	return nil
 }
 
-// queryStrings runs query, which selects one text column, and returns
-// its values in the order of the rows.
-func (r *SnapshotRepository) queryStrings(
-	ctx context.Context, query string, args ...any,
-) ([]string, error) {
-	rows, err := r.db.conn.QueryContext(ctx, query, args...)
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() { _ = rows.Close() }()
-
-	var values []string
-
-	for rows.Next() {
-		var value string
-
-		err := rows.Scan(&value)
-		if err != nil {
-			return nil, err
-		}
-
-		values = append(values, value)
-	}
-
-	return values, rows.Err()
-}
-
 // extendedCompressionRatio computes the compression ratio for a snapshot
 // from its stored blob_size and the given uncompressed size. Returns 1.0
 // when the uncompressed size is zero.

internal/database/snapshots_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"math"
-	"slices"
 	"testing"
 	"time"
 
@@ -423,52 +422,3 @@ func TestSnapshotRepositoryDuplicate(t *testing.T) {
 		t.Error("expected error for duplicate snapshot")
 	}
 }
-
-// Deleting a snapshot from the local index deletes the mount points its
-// backup recorded, and no other snapshot's. See
-// https://git.eeqj.de/sneak/vaultik/issues/395.
-func TestSnapshotRepositoryDeleteRemovesMountPoints(t *testing.T) {
-	t.Parallel()
-
-	db, cleanup := setupTestDB(t)
-	defer cleanup()
-
-	ctx := context.Background()
-	repo := database.NewSnapshotRepository(db)
-
-	for _, id := range []types.SnapshotID{"kept", "deleted"} {
-		err := repo.Create(ctx, nil, &database.Snapshot{
-			ID:             id,
-			Hostname:       testHostname,
-			VaultikVersion: testVersion,
-			StartedAt:      time.Now().Truncate(time.Second),
-		})
-		if err != nil {
-			t.Fatalf("failed to create snapshot: %v", err)
-		}
-
-		err = repo.AddMountPoint(ctx, nil, id.String(), "/data/nas")
-		if err != nil {
-			t.Fatalf("failed to add mount point: %v", err)
-		}
-	}
-
-	err := repo.Delete(ctx, "deleted")
-	if err != nil {
-		t.Fatalf("failed to delete snapshot: %v", err)
-	}
-
-	for id, want := range map[string][]string{
-		"kept":    {"/data/nas"},
-		"deleted": nil,
-	} {
-		got, err := repo.GetMountPoints(ctx, id)
-		if err != nil {
-			t.Fatalf("failed to read mount points: %v", err)
-		}
-
-		if !slices.Equal(got, want) {
-			t.Errorf("mount points of %s: got %v, want %v", id, got, want)
-		}
-	}
-}

internal/snapshot/device_number_test.go

@@ -1,40 +0,0 @@
-//nolint:testpackage // exercises the unexported deviceNumberFromStat
-package snapshot
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// The device number a real backup reads is the same for a directory and
-// a file in it, and differs between the temp directory and /dev.
-// Without it no mount point is ever found. See
-// https://git.eeqj.de/sneak/vaultik/issues/395.
-func TestDeviceNumberFromStat(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	file := filepath.Join(dir, "file.txt")
-	require.NoError(t, os.WriteFile(file, nil, 0o600))
-
-	deviceOf := func(path string) uint64 {
-		t.Helper()
-
-		info, err := os.Stat(path)
-		require.NoError(t, err)
-
-		device, ok := deviceNumberFromStat(info)
-		require.True(t, ok, "no device number read for %s", path)
-
-		return device
-	}
-
-	assert.Equal(t, deviceOf(dir), deviceOf(file))
-
-	// /dev is a different filesystem from the temp dir on Linux, macOS and in Docker.
-	assert.NotEqual(t, deviceOf(dir), deviceOf("/dev"))
-}

internal/snapshot/module.go

@@ -1,8 +1,6 @@
 package snapshot
 
 import (
-	"os"
-
 	"github.com/spf13/afero"
 	"go.uber.org/fx"
 	"sneak.berlin/go/vaultik/internal/config"
@@ -21,9 +19,6 @@ type ScannerParams struct {
 	// PreviousSnapshotID is the most recent completed snapshot of the
 	// same name, "" for none.
 	PreviousSnapshotID string
-	// DeviceNumber is ScannerConfig.DeviceNumber; nil reads it from the
-	// file's stat.
-	DeviceNumber func(info os.FileInfo) (uint64, bool)
 }
 
 // Module exports backup functionality as an fx module.
@@ -64,7 +59,6 @@ func provideScannerFactory(
 			Exclude:            excludes,
 			SkipErrors:         params.SkipErrors,
 			PreviousSnapshotID: params.PreviousSnapshotID,
-			DeviceNumber:       params.DeviceNumber,
 		})
 	}
 }

internal/snapshot/mount_point_test.go

@@ -1,245 +0,0 @@
-package snapshot_test
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"slices"
-	"strings"
-	"syscall"
-	"testing"
-
-	"github.com/spf13/afero"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/vaultik/internal/database"
-	"sneak.berlin/go/vaultik/internal/snapshot"
-)
-
-// A scan records with the snapshot each directory on a different device
-// from its parent directory that the walk found an entry in, as a mount
-// point is, the scanned path included. A filesystem that gives no device
-// numbers, as the in-memory one, records none. See
-// https://git.eeqj.de/sneak/vaultik/issues/395.
-func TestScanRecordsMountPoints(t *testing.T) {
-	t.Parallel()
-
-	const (
-		scannedPath = "/data/source"
-		snapshotID  = "mount-points"
-	)
-
-	tests := []struct {
-		name string
-		// onVolume names the directories on the volume's device; every
-		// other directory is on another one. nil leaves the device
-		// numbers to the in-memory filesystem, which has none.
-		onVolume []string
-		want     []string
-	}{
-		{
-			name:     "volume below the scanned path",
-			onVolume: []string{"nas"},
-			want:     []string{scannedPath + "/nas"},
-		},
-		{
-			name:     "volume at the scanned path",
-			onVolume: []string{"source", "nas"},
-			want:     []string{scannedPath},
-		},
-		{name: "no device numbers", want: nil},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			ctx := context.Background()
-			fs := afero.NewMemMapFs()
-
-			for _, path := range []string{
-				scannedPath + "/notes.txt", scannedPath + "/nas/a.txt",
-			} {
-				require.NoError(t, fs.MkdirAll(filepath.Dir(path), 0o755))
-				require.NoError(t, afero.WriteFile(fs, path, []byte(path), 0o644))
-			}
-
-			db, err := database.NewTestDB()
-			require.NoError(t, err)
-			t.Cleanup(func() { _ = db.Close() })
-
-			repos := database.NewRepositories(db)
-			createTestSnapshotRecord(ctx, t, repos, snapshotID)
-
-			cfg := snapshot.ScannerConfig{
-				FS:               fs,
-				ChunkSize:        int64(1024 * 16),
-				Repositories:     repos,
-				MaxBlobSize:      int64(1024 * 1024),
-				CompressionLevel: 3,
-				AgeRecipients:    []string{testAgePublicKey},
-			}
-			if tt.onVolume != nil {
-				cfg.DeviceNumber = func(info os.FileInfo) (uint64, bool) {
-					if slices.Contains(tt.onVolume, info.Name()) {
-						return 2, true
-					}
-
-					return 1, true
-				}
-			}
-
-			_, err = snapshot.NewScanner(cfg).Scan(ctx, scannedPath, snapshotID)
-			require.NoError(t, err)
-
-			got, err := repos.Snapshots.GetMountPoints(ctx, snapshotID)
-			require.NoError(t, err)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-// automountFs is an in-memory filesystem with a volume at mountPoint
-// that is mounted on first access: opening mountPoint to list it mounts
-// the volume or, if it cannot be mounted, fails with "no such file or
-// directory", as with the autofs daemon. Stat records the device an
-// entry is on at that moment, as a real stat does: unmountedDevice for
-// mountPoint until the volume is mounted; the volume's, 2, for
-// mountPoint once it is and for everything in it; 1 for everything else.
-type automountFs struct {
-	afero.Fs
-
-	mountPoint      string
-	unmountedDevice uint64
-	canMount        bool
-	mounted         bool
-}
-
-//nolint:ireturn // afero.Fs.Open is defined to return the interface.
-func (fs *automountFs) Open(name string) (afero.File, error) {
-	if name == fs.mountPoint && !fs.canMount {
-		return nil, &os.PathError{Op: "open", Path: name, Err: syscall.ENOENT}
-	}
-
-	if name == fs.mountPoint {
-		fs.mounted = true
-	}
-
-	return fs.Fs.Open(name)
-}
-
-func (fs *automountFs) Stat(name string) (os.FileInfo, error) {
-	info, err := fs.Fs.Stat(name)
-	if err != nil {
-		return nil, err
-	}
-
-	device := uint64(1)
-
-	switch {
-	case name == fs.mountPoint && !fs.mounted:
-		device = fs.unmountedDevice
-	case name == fs.mountPoint || strings.HasPrefix(name, fs.mountPoint+"/"):
-		device = 2
-	}
-
-	return statWithDevice{FileInfo: info, device: device}, nil
-}
-
-// statWithDevice is an entry automountFs.Stat looked up, with the device
-// it was on then.
-type statWithDevice struct {
-	os.FileInfo
-
-	device uint64
-}
-
-// deviceAtLookup returns the device automountFs.Stat recorded for info.
-func deviceAtLookup(info os.FileInfo) (uint64, bool) {
-	stat, ok := info.(statWithDevice)
-
-	return stat.device, ok
-}
-
-// A volume mounted on first access is mounted when the walk lists its
-// mount point. Until then the mount point is on the automounter's own
-// device (a systemd automount) or on its parent's (an autofs map that
-// shows its mount points before mounting them). Either way only the
-// mount point is recorded, by the backup that mounts the volume and by a
-// later one that finds it mounted. Listing an automount point whose
-// volume cannot be mounted fails; it is not recorded, because the walk
-// finds no entry in it. See https://git.eeqj.de/sneak/vaultik/issues/395.
-func TestScanRecordsOnlyTheMountPointOfAnAutomountedVolume(t *testing.T) {
-	t.Parallel()
-
-	const scannedPath = "/data/source"
-
-	mountPoint := scannedPath + "/nas"
-
-	tests := []struct {
-		name            string
-		unmountedDevice uint64
-		canMount        bool
-		want            []string
-	}{
-		{
-			name:            "on the automounter's device until listed",
-			unmountedDevice: 3, canMount: true, want: []string{mountPoint},
-		},
-		{
-			name:            "on its parent's device until listed",
-			unmountedDevice: 1, canMount: true, want: []string{mountPoint},
-		},
-		{
-			name:            "volume that cannot be mounted",
-			unmountedDevice: 1, canMount: false, want: nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			ctx := context.Background()
-			fs := &automountFs{
-				Fs: afero.NewMemMapFs(), mountPoint: mountPoint,
-				unmountedDevice: tt.unmountedDevice, canMount: tt.canMount,
-			}
-
-			require.NoError(t, fs.MkdirAll(mountPoint+"/photos", 0o755))
-
-			for _, path := range []string{
-				scannedPath + "/notes.txt", mountPoint + "/photos/a.jpg",
-			} {
-				require.NoError(t, afero.WriteFile(fs, path, []byte(path), 0o644))
-			}
-
-			db, err := database.NewTestDB()
-			require.NoError(t, err)
-			t.Cleanup(func() { _ = db.Close() })
-
-			repos := database.NewRepositories(db)
-
-			for _, snapshotID := range []string{"first", "later"} {
-				createTestSnapshotRecord(ctx, t, repos, snapshotID)
-
-				scanner := snapshot.NewScanner(snapshot.ScannerConfig{
-					FS:               fs,
-					ChunkSize:        int64(1024 * 16),
-					Repositories:     repos,
-					MaxBlobSize:      int64(1024 * 1024),
-					CompressionLevel: 3,
-					AgeRecipients:    []string{testAgePublicKey},
-					DeviceNumber:     deviceAtLookup,
-				})
-
-				_, err = scanner.Scan(ctx, scannedPath, snapshotID)
-				require.NoError(t, err)
-
-				got, err := repos.Snapshots.GetMountPoints(ctx, snapshotID)
-				require.NoError(t, err)
-				assert.Equal(t, tt.want, got, "mount points of the %s backup", snapshotID)
-			}
-		})
-	}
-}

internal/snapshot/scanner.go

@@ -73,9 +73,6 @@ type Scanner struct {
 	skipErrors bool
 	// ui is the user-facing output; never nil (defaults to a discarding writer).
 	ui *ui.Writer
-	// deviceNumber returns the number of the device that holds a file;
-	// never nil (defaults to deviceNumberFromStat).
-	deviceNumber func(info os.FileInfo) (uint64, bool)
 
 	// In-memory cache of known chunk hashes for fast existence checks
 	knownChunks   map[string]struct{}
@@ -139,10 +136,6 @@ type ScannerConfig struct {
 	// PreviousSnapshotID is the most recent completed snapshot of the
 	// same name, "" for none.
 	PreviousSnapshotID string
-	// DeviceNumber returns the number of the device that holds a file,
-	// and false when there is none to read. nil reads it from the file's
-	// stat; tests replace it, since the in-memory test filesystem has none.
-	DeviceNumber func(info os.FileInfo) (uint64, bool)
 }
 
 // ScanResult contains the results of a scan operation. Files and bytes
@@ -175,12 +168,6 @@ type ScanResult struct {
 	// skipped because it could not be read or listed; the rest are files
 	// removed after the walk listed them.
 	FilesUnreadable int
-
-	// EntriesFound counts the entries the walk found and could look up
-	// that no exclude pattern matches, leaving out the scanned path
-	// itself when it is a directory. It is zero for an empty directory,
-	// such as the mount point of a volume that is not mounted.
-	EntriesFound int
 }
 
 // NewScanner creates a new scanner instance
@@ -221,11 +208,6 @@ func NewScanner(cfg ScannerConfig) *Scanner {
 		uiw = ui.NewWithColor(io.Discard, false)
 	}
 
-	deviceNumber := cfg.DeviceNumber
-	if deviceNumber == nil {
-		deviceNumber = deviceNumberFromStat
-	}
-
 	return &Scanner{
 		fs:                 cfg.FS,
 		chunker:            chunker.NewChunker(cfg.ChunkSize),
@@ -241,7 +223,6 @@ func NewScanner(cfg ScannerConfig) *Scanner {
 		skipErrors:         cfg.SkipErrors,
 		previousSnapshotID: cfg.PreviousSnapshotID,
 		ui:                 uiw,
-		deviceNumber:       deviceNumber,
 		pendingChunkHashes: make(map[string]struct{}),
 	}
 }
@@ -310,7 +291,7 @@ func (s *Scanner) Scan(
 		}
 	}
 
-	err = s.recordDirectories(ctx, scanResult)
+	err = s.recordDirectories(ctx, scanResult.Directories)
 	if err != nil {
 		return nil, err
 	}
@@ -888,11 +869,6 @@ type ScanPhaseResult struct {
 	FilesToProcess   []*FileToProcess
 	UnchangedFileIDs []types.FileID   // IDs of unchanged files to associate with snapshot
 	Directories      []*FileToProcess // Every directory found, to record
-	// MountPoints are the directories, the scanned path included, that
-	// the walk found an entry in and, once it had listed them, on a
-	// different device from their parent directory (see
-	// recordIfMountPoint).
-	MountPoints []string
 }
 
 // scanPhase performs the initial directory scan to identify files to process
@@ -912,7 +888,7 @@ func (s *Scanner) scanPhase(
 	// estimate leaves them out.
 	estimatedTotal := countNonDirectories(knownFiles)
 
-	collector := &scanCollector{dirsWithEntries: make(map[string]struct{})}
+	collector := &scanCollector{}
 
 	// Set up periodic status output
 	startTime := time.Now()
@@ -952,13 +928,6 @@ func (s *Scanner) scanPhase(
 		default:
 		}
 
-		// The scanned directory itself is not an entry found in it.
-		if filePath != path || !info.IsDir() {
-			result.EntriesFound++
-		}
-
-		s.recordIfMountPoint(filePath, path, collector)
-
 		// Handle symlinks and directories
 		handled, err := s.recordSpecialEntry(
 			filePath, info, existingFiles, knownFiles, collector, result)
@@ -971,8 +940,18 @@ func (s *Scanner) scanPhase(
 			return nil
 		}
 
-		filesScanned, changedCount := s.recordRegularFile(
+		// Track this file as existing (for deletion detection)
-			filePath, info, existingFiles, knownFiles, collector, result)
+		existingFiles[filePath] = struct{}{}
+
+		// Check file against in-memory map (no DB query!)
+		file := s.buildRegularFileEntry(filePath, info)
+		needsProcessing := s.checkFileInMemory(file, knownFiles)
+
+		filesScanned, changedCount := collector.recordFile(
+			filePath, info, file, needsProcessing)
+
+		// Update result stats
+		s.updateScanEntryStats(result, needsProcessing, info)
 
 		// Output periodic status
 		if time.Since(lastStatusTime) >= scanStatusInterval {
@@ -993,7 +972,6 @@ func (s *Scanner) scanPhase(
 		FilesToProcess:   collector.filesToProcess,
 		UnchangedFileIDs: collector.unchangedFileIDs,
 		Directories:      collector.directories,
-		MountPoints:      collector.mountPoints,
 	}, nil
 }
 
@@ -1049,30 +1027,6 @@ func (s *Scanner) recordSpecialEntry(
 	return false, nil
 }
 
-// recordRegularFile records a regular file as recordSpecialEntry does a
-// symlink and returns the running scanned and changed counts.
-func (s *Scanner) recordRegularFile(
-	filePath string, info os.FileInfo,
-	existingFiles map[string]struct{},
-	knownFiles map[string]*database.File,
-	collector *scanCollector, result *ScanResult,
-) (int64, int) {
-	// Track this file as existing (for deletion detection)
-	existingFiles[filePath] = struct{}{}
-
-	// Check file against in-memory map (no DB query!)
-	file := s.buildRegularFileEntry(filePath, info)
-	needsProcessing := s.checkFileInMemory(file, knownFiles)
-
-	filesScanned, changedCount := collector.recordFile(
-		filePath, info, file, needsProcessing)
-
-	// Update result stats
-	s.updateScanEntryStats(result, needsProcessing, info)
-
-	return filesScanned, changedCount
-}
-
 // countRemovedDuringWalk counts an entry that was in its directory's
 // listing but was gone when the walk looked it up, like a file removed
 // before phase 2 reads it: as examined and failed, and not as an error,
@@ -1120,29 +1074,6 @@ type scanCollector struct {
 	unchangedFileIDs []types.FileID // Just IDs - no new records needed
 	directories      []*FileToProcess
 	filesScanned     int64
-	// dirsWithEntries holds each directory the walk has found an entry in.
-	dirsWithEntries map[string]struct{}
-	mountPoints     []string
-}
-
-// firstEntryIn notes that the walk found an entry in directory dir and
-// reports whether it is the first one.
-func (c *scanCollector) firstEntryIn(dir string) bool {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	_, seen := c.dirsWithEntries[dir]
-	c.dirsWithEntries[dir] = struct{}{}
-
-	return !seen
-}
-
-// addMountPoint sets a mount point aside to be recorded.
-func (c *scanCollector) addMountPoint(dir string) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	c.mountPoints = append(c.mountPoints, dir)
 }
 
 // addDirectory sets a directory aside to be recorded. It is not counted
@@ -1334,100 +1265,20 @@ func (s *Scanner) buildDirectoryEntry(path string, info os.FileInfo) *database.F
 	}
 }
 
-// recordDirectories records every directory the walk found, and its
+// recordDirectories records every directory the walk found. A directory
-// mount points (see recordMountPoints). A directory has no data to back
+// has no data to back up, so it is not among the files counted and
-// up, so it is not among the files counted and backed up.
+// backed up.
 func (s *Scanner) recordDirectories(
-	ctx context.Context, scanned *ScanPhaseResult,
+	ctx context.Context, directories []*FileToProcess,
 ) error {
-	for _, dir := range scanned.Directories {
+	for _, dir := range directories {
 		err := s.recordNonRegularFile(ctx, dir)
 		if err != nil {
 			return fmt.Errorf("recording directory %s: %w", dir.Path, err)
 		}
 	}
 
-	return s.recordMountPoints(ctx, scanned.MountPoints)
+	return nil
-}
-
-// recordMountPoints records with the snapshot the mount points the walk
-// found (see ScanPhaseResult.MountPoints).
-func (s *Scanner) recordMountPoints(
-	ctx context.Context, mountPoints []string,
-) error {
-	return s.repos.WithTx(ctx, func(txCtx context.Context, tx *sql.Tx) error {
-		for _, dir := range mountPoints {
-			log.Info("Found a mount point", "path", dir)
-
-			err := s.repos.Snapshots.AddMountPoint(txCtx, tx, s.snapshotID, dir)
-			if err != nil {
-				return fmt.Errorf("recording mount point %s: %w", dir, err)
-			}
-		}
-
-		return nil
-	})
-}
-
-// recordIfMountPoint sets the directory that holds entry, a path the
-// walk found, aside to be recorded as a mount point if it is on a
-// different device from its parent directory. The walk calls it for each
-// entry it finds, and it decides on the first entry in a directory, so a
-// directory the walk found no entry in is never recorded. By then the
-// walk has listed the directory, which mounts a volume mounted there on
-// first access, so the directory and its parent are looked up again:
-// before the listing, the directory can be on the automounter's own
-// device (a systemd automount) or on its parent's (an autofs map that
-// shows its mount points before mounting them). The scanned path is in
-// no listing the walk made, so it is skipped as an entry. A directory
-// that cannot be looked up then, or whose parent cannot, is not
-// recorded, so this snapshot does not stop the prune of a later backup
-// that misses its volume.
-func (s *Scanner) recordIfMountPoint(
-	entry, scannedPath string, collector *scanCollector,
-) {
-	dir := filepath.Dir(entry)
-
-	if entry == scannedPath || !collector.firstEntryIn(dir) {
-		return
-	}
-
-	dirDevice, ok := s.deviceNumberAt(dir)
-	if !ok {
-		return
-	}
-
-	parentDevice, ok := s.deviceNumberAt(filepath.Dir(dir))
-	if ok && dirDevice != parentDevice {
-		collector.addMountPoint(dir)
-	}
-}
-
-// deviceNumberAt looks path up now and returns the number of the device
-// that holds it, and false when the lookup fails (logged) or gives no
-// device number.
-func (s *Scanner) deviceNumberAt(path string) (uint64, bool) {
-	info, err := s.fs.Stat(path)
-	if err != nil {
-		log.Warn("Could not look up a directory to check for a mount point",
-			"path", path, "error", err)
-
-		return 0, false
-	}
-
-	return s.deviceNumber(info)
-}
-
-// deviceNumberFromStat returns the number of the device that holds the
-// file info describes, and false when info carries no stat, as from the
-// in-memory test filesystem.
-func deviceNumberFromStat(info os.FileInfo) (uint64, bool) {
-	stat, ok := info.Sys().(*syscall.Stat_t)
-	if !ok {
-		return 0, false
-	}
-
-	return uint64(stat.Dev), true //nolint:unconvert // Dev is an int32 on darwin
 }
 
 // recordNonRegularFile writes a symlink or directory entry to the database

internal/snapshot/snapshot.go

@@ -518,8 +518,8 @@ type CleanupStats struct {
 //
 // The cleanup is performed in a specific order to maintain referential integrity:
 //  1. Delete other snapshots
-//  2. Delete orphaned snapshot associations (snapshot_files, snapshot_blobs,
+//  2. Delete orphaned snapshot associations (snapshot_files, snapshot_blobs)
-//     snapshot_mount_points) for deleted snapshots
+//     for deleted snapshots
 //  3. Delete orphaned files (not in the current snapshot)
 //  4. Delete orphaned chunk-to-file mappings (references to deleted files)
 //  5. Delete orphaned blobs (not in the current snapshot)
@@ -948,8 +948,8 @@ func (sm *SnapshotManager) deleteOtherSnapshots(
 	return nil
 }
 
-// deleteOrphanedSnapshotAssociations deletes snapshot_files,
+// deleteOrphanedSnapshotAssociations deletes snapshot_files and
-// snapshot_blobs and snapshot_mount_points for deleted snapshots
+// snapshot_blobs for deleted snapshots
 func (sm *SnapshotManager) deleteOrphanedSnapshotAssociations(
 	ctx context.Context, tx *sql.Tx, currentSnapshotID string,
 ) error {
@@ -983,19 +983,6 @@ func (sm *SnapshotManager) deleteOrphanedSnapshotAssociations(
 	log.Debug("[Temp DB Cleanup] Deleted snapshot_blobs associations",
 		"count", rowsAffected)
 
-	// Delete the mount points other snapshots recorded
-	query := "DELETE FROM snapshot_mount_points WHERE snapshot_id != ?"
-	database.LogSQL("Execute", query, currentSnapshotID)
-
-	result, err = tx.ExecContext(ctx, query, currentSnapshotID)
-	if err != nil {
-		return fmt.Errorf("deleting orphaned snapshot_mount_points: %w", err)
-	}
-
-	rowsAffected, _ = result.RowsAffected()
-	log.Debug("[Temp DB Cleanup] Deleted snapshot_mount_points rows",
-		"count", rowsAffected)
-
 	return nil
 }
 

internal/snapshot/snapshot_test.go

@@ -7,14 +7,12 @@ import (
 	"database/sql"
 	"io"
 	"path/filepath"
-	"slices"
 	"testing"
 
 	"github.com/spf13/afero"
 	"sneak.berlin/go/vaultik/internal/config"
 	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/log"
-	"sneak.berlin/go/vaultik/internal/types"
 )
 
 const (
@@ -389,77 +387,6 @@ func TestCleanSnapshotDBNonExistentSnapshot(t *testing.T) {
 	}
 }
 
-// The exported metadata database keeps only the mount points that the
-// exported snapshot recorded. See
-// https://git.eeqj.de/sneak/vaultik/issues/395.
-func TestCleanSnapshotDBKeepsOnlyTheSnapshotsMountPoints(t *testing.T) {
-	log.Initialize(log.Config{})
-	t.Parallel()
-
-	ctx := context.Background()
-	dbPath := filepath.Join(t.TempDir(), "export.db")
-
-	db, err := database.New(ctx, dbPath)
-	if err != nil {
-		t.Fatalf("failed to create database: %v", err)
-	}
-
-	repos := database.NewRepositories(db)
-
-	for _, id := range []types.SnapshotID{"exported", "other"} {
-		err = repos.Snapshots.Create(ctx, nil, &database.Snapshot{ID: id})
-		if err != nil {
-			t.Fatalf("failed to create snapshot: %v", err)
-		}
-
-		err = repos.Snapshots.AddMountPoint(ctx, nil, id.String(), "/data/"+id.String())
-		if err != nil {
-			t.Fatalf("failed to add mount point: %v", err)
-		}
-	}
-
-	err = db.Close()
-	if err != nil {
-		t.Fatalf("failed to close database: %v", err)
-	}
-
-	sm := &SnapshotManager{
-		config: &config.Config{
-			CompressionLevel: 3,
-			AgeRecipients:    []string{testAgeRecipient},
-		},
-		fs: afero.NewOsFs(),
-	}
-
-	_, err = sm.cleanSnapshotDB(ctx, dbPath, "exported")
-	if err != nil {
-		t.Fatalf("failed to clean snapshot database: %v", err)
-	}
-
-	cleaned, err := database.New(ctx, dbPath)
-	if err != nil {
-		t.Fatalf("failed to open cleaned database: %v", err)
-	}
-
-	defer func() { _ = cleaned.Close() }()
-
-	cleanedRepos := database.NewRepositories(cleaned)
-
-	for id, want := range map[string][]string{
-		"exported": {"/data/exported"},
-		"other":    nil,
-	} {
-		got, err := cleanedRepos.Snapshots.GetMountPoints(ctx, id)
-		if err != nil {
-			t.Fatalf("failed to read mount points: %v", err)
-		}
-
-		if !slices.Equal(got, want) {
-			t.Errorf("mount points of %s: got %v, want %v", id, got, want)
-		}
-	}
-}
-
 // Two creates of one snapshot name back to back start within one second,
 // the resolution of the timestamp in a snapshot ID. See
 // https://git.eeqj.de/sneak/vaultik/issues/270.

internal/storage/faultstore/faultstore.go

@@ -2,17 +2,15 @@
 // faults on demand, so tests can reproduce the failure modes a real
 // backend exhibits: an upload that fails partway, a backend that reports
 // success while storing nothing, reads that return corrupt or truncated
-// bytes, and a delete or a stat the backend refuses. It is the seam
+// bytes, and a delete the backend refuses. It is the seam called for by
-// called for by the fault-injection tests (sneak/vaultik issue 72) and
+// the fault-injection tests (sneak/vaultik issue 72) and is meant to be
-// is meant to be reused by future tests rather than re-implemented per
+// reused by future tests rather than re-implemented per case.
-// case.
 //
-// The wrapper delegates every method to the inner Storer. Four hooks
+// The wrapper delegates every method to the inner Storer. Three hooks
 // change that: OnPut decides the fate of each write, OnGet decides how
-// each read's bytes are returned, OnDelete decides whether each delete
+// each read's bytes are returned, and OnDelete decides whether each
-// fails, and OnStat whether each stat fails. All are keyed by the object
+// delete fails. All are keyed by the object key, so a test can fault
-// key, so a test can fault only blobs, only metadata, or a single
+// only blobs, only metadata, or a single object.
-// object.
 package faultstore
 
 import (
@@ -32,11 +30,6 @@ var ErrInjectedUpload = errors.New("faultstore: injected upload failure")
 // fail.
 var ErrInjectedDelete = errors.New("faultstore: injected delete failure")
 
-// ErrInjectedStat is returned by a Stat the OnStat hook chose to fail.
-// It is not storage.ErrNotFound: the backend refused the request, as S3
-// refuses a HEAD to credentials that allow only PUT.
-var ErrInjectedStat = errors.New("faultstore: injected stat failure")
-
 // PutAction is the disposition OnPut assigns to a write.
 type PutAction int
 
@@ -83,10 +76,6 @@ type Storer struct {
 	// object key. Returning true fails the delete and leaves the object
 	// in place.
 	OnDelete func(key string) bool
-
-	// OnStat, when set, is consulted before every Stat with the object
-	// key. Returning true fails the stat with ErrInjectedStat.
-	OnStat func(key string) bool
 }
 
 // New wraps inner. inner must be non-nil.
@@ -170,12 +159,8 @@ func damage(fault GetFault, data []byte) []byte {
 	return out
 }
 
-// Stat returns the object's info unless OnStat fails the stat.
+// Stat delegates unchanged.
 func (f *Storer) Stat(ctx context.Context, key string) (*storage.ObjectInfo, error) {
-	if f.OnStat != nil && f.OnStat(key) {
-		return nil, fmt.Errorf("%w for %q", ErrInjectedStat, key)
-	}
-
 	return f.inner.Stat(ctx, key)
 }
 

internal/vaultik/destination_marker.go

@@ -5,16 +5,14 @@ import (
 	"fmt"
 	"strings"
 
-	"sneak.berlin/go/vaultik/internal/log"
 	"sneak.berlin/go/vaultik/internal/storage"
 )
 
 // destinationMarkerKey is the object every backup writes at the root of
 // the backup destination store. While the local index holds a snapshot
-// stored there, a destination that answers a look-up of it with not
+// stored there, a destination without it is treated as not present: an
-// found is treated as not present: an unplugged volume leaves an empty
+// unplugged volume leaves an empty directory at its mount point, which
-// directory at its mount point, which would otherwise read as a store
+// would otherwise read as a store whose snapshots are all gone.
-// whose snapshots are all gone.
 const destinationMarkerKey = "vaultik-destination.txt"
 
 // destinationMarkerText is the whole content of the marker. It names no
@@ -22,24 +20,16 @@ const destinationMarkerKey = "vaultik-destination.txt"
 const destinationMarkerText = "This is a vaultik backup destination store.\n"
 
 // errDestinationNotPresent is returned when the local index holds a
-// snapshot stored on the backup destination store and the store answers
+// snapshot stored on the backup destination store and the store has no
-// that it has no marker.
+// marker.
 var errDestinationNotPresent = errors.New("backup destination store is not present")
 
 // checkDestinationMarker returns errDestinationNotPresent when the local
 // index holds a snapshot stored on the backup destination store and the
-// store answers that it has no marker. With no snapshot in the local
+// store has no marker. With no snapshot in the local index, as on a
-// index, as on a first backup or on another machine, there is nothing to
+// first backup or on another machine, there is nothing to check; nor
-// check; nor when the local index is bound to a different destination
+// when the local index is bound to a different destination than the
-// than the configured one, since its snapshots are stored there.
+// configured one, since its snapshots are stored there.
-//
-// A look-up of the marker that fails for any other reason than not
-// found is logged and otherwise ignored, because the check could not be
-// made: S3 refuses it to credentials that allow only PUT, which is all
-// a backup needs. The check exists for a file:// volume's empty mount
-// point, which always answers not found, and a destination that cannot
-// be reached fails on the next request made to it, such as the backup's
-// PUT of the marker.
 func (v *Vaultik) checkDestinationMarker() error {
 	ids, err := v.localSnapshotIDs()
 	if err != nil {
@@ -73,11 +63,8 @@ func (v *Vaultik) checkDestinationMarker() error {
 			destinationMarkerKey)
 	}
 
-	// Info, not a warning: --cron must stay silent on a successful
-	// backup from a host whose credentials allow only PUT.
 	if err != nil {
-		log.Info("Could not check the backup destination store for its marker",
+		return fmt.Errorf("checking for %s: %w", destinationMarkerKey, err)
-			"key", destinationMarkerKey, "error", err)
 	}
 
 	return nil

internal/vaultik/destination_marker_test.go

@@ -13,16 +13,15 @@ import (
 	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/log"
 	"sneak.berlin/go/vaultik/internal/storage"
-	"sneak.berlin/go/vaultik/internal/storage/faultstore"
 	"sneak.berlin/go/vaultik/internal/vaultik"
 )
 
 // These tests cover https://git.eeqj.de/sneak/vaultik/issues/239: a
 // file:// destination at a volume's mount point leaves an empty directory
 // behind when the volume is unplugged. While the local index holds
-// snapshots, a destination that answers that it has no
+// snapshots, a destination without vaultik-destination.txt is not present,
-// vaultik-destination.txt is not present, so no command may write to it
+// so no command may write to it or conclude from it that the local
-// or conclude from it that the local snapshots are gone.
+// snapshots are gone.
 
 // markerFile is the name of the file a backup writes at the root of the
 // destination.
@@ -94,39 +93,6 @@ func TestBackupRefusesDestinationWithoutMarker(t *testing.T) {
 	assertUntouched(ctx, t, repos, storeDir)
 }
 
-// TestBackupGoesOnWhenMarkerCannotBeChecked checks that a backup goes on
-// and writes the marker when looking it up fails with an error other
-// than not found, as S3 answers credentials that allow only PUT
-// (https://git.eeqj.de/sneak/vaultik/issues/389), and that a marker
-// that is not found still stops it.
-func TestBackupGoesOnWhenMarkerCannotBeChecked(t *testing.T) {
-	log.Initialize(log.Config{})
-	t.Parallel()
-
-	ctx := context.Background()
-	storeDir := t.TempDir()
-	v, repos, _ := backUpToFileDestination(ctx, t, storeDir)
-
-	// Removed so the test sees the backup write it again: with the
-	// look-up failing, the backup cannot tell that it is gone.
-	markerPath := filepath.Join(storeDir, markerFile)
-	require.NoError(t, os.Remove(markerPath))
-
-	store := faultstore.New(v.Storage)
-	store.OnStat = func(key string) bool { return key == markerFile }
-	v.Storage = store
-
-	require.NoError(t, backUp(v, "second"))
-	localSnapshotID(ctx, t, repos, "second")
-	assert.FileExists(t, markerPath)
-
-	require.NoError(t, os.Remove(markerPath))
-
-	store.OnStat = nil
-
-	require.ErrorContains(t, backUp(v, "third"), markerFile)
-}
-
 // TestBackupChecksMarkerBeforeDroppingIncompleteSnapshots checks that
 // snapshot create writes nothing when the local index holds only an
 // incomplete snapshot and the destination has no marker. The backup drops

internal/vaultik/fault_injection_test.go

@@ -679,7 +679,6 @@ func faultScannerFactory(
 			Exclude:            params.Exclude,
 			SkipErrors:         params.SkipErrors,
 			PreviousSnapshotID: params.PreviousSnapshotID,
-			DeviceNumber:       params.DeviceNumber,
 		})
 	}
 }

internal/vaultik/nuke_remote_test.go

@@ -76,7 +76,7 @@ func TestNukeRemoteLeavesNoFiles(t *testing.T) {
 // TestNukeRemoteFailsWhenADeleteFails checks that remote nuke returns an
 // error when a snapshot's metadata or a blob cannot be deleted, does not
 // report the store empty, and advises running nuke again: prune deletes
-// no snapshot metadata that has its manifest.
+// no metadata.
 func TestNukeRemoteFailsWhenADeleteFails(t *testing.T) {
 	log.Initialize(log.Config{})
 	t.Parallel()

internal/vaultik/prune.go

@@ -66,8 +66,8 @@ func (v *Vaultik) NukeRemote(force bool) error {
 
 	// Checked before anything is deleted: running nuke again would fail
 	// the same way, so the advice below must not follow these errors.
-	// The listing also fails on a destination that answers that it has
+	// The listing also fails on a destination without the marker while
-	// no marker while the local index holds snapshots.
+	// the local index holds snapshots.
 	err := v.EnsureStorageBinding()
 	if err != nil {
 		return err

internal/vaultik/snapshot.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -45,25 +44,6 @@ var ErrPostBackupPruneFailed = errors.New("post-backup prune failed")
 // kept, so the caller can report it apart from a failed backup.
 var ErrFilesUnreadable = errors.New("file(s) could not be read")
 
-// ErrSourcePathEmpty is returned when --prune skipped the post-backup
-// prune because the scan found nothing in a configured path of a
-// snapshot, as in the mount point of a volume that is not mounted. The
-// snapshots are complete and kept, so the caller can report it apart
-// from a failed backup. A run that also skipped unreadable files
-// returns ErrFilesUnreadable instead.
-var ErrSourcePathEmpty = errors.New("source path(s) were empty")
-
-// ErrVolumeNotMounted is returned when --prune skipped the post-backup
-// prune because a directory that an earlier snapshot of the same name
-// found as a mount point was not found as one in this run: the volume
-// mounted there is not mounted, the run found no entry in it, or the
-// directory is no longer backed up. The snapshots are complete and
-// kept, so the caller can report it apart from a failed backup. A run
-// that also skipped unreadable files or found a configured path empty
-// returns ErrFilesUnreadable or ErrSourcePathEmpty instead.
-var ErrVolumeNotMounted = errors.New(
-	"mount point(s) an earlier snapshot recorded were not found")
-
 // listRecentLimit caps how many snapshot rows are fetched from the
 // local index for listing and purge operations.
 const listRecentLimit = 10000
@@ -154,10 +134,17 @@ func (v *Vaultik) CreateSnapshot(opts *SnapshotCreateOptions) error {
 		return err
 	}
 
-	filesUnreadable, emptyPaths, unmountedPaths, err := v.createNamedSnapshots(
+	// Process each named snapshot
-		opts, hostname, snapshotNames)
+	filesUnreadable := 0
-	if err != nil {
+
-		return err
+	for snapIdx, snapName := range snapshotNames {
+		unreadable, err := v.createNamedSnapshot(
+			opts, hostname, snapName, snapIdx+1, len(snapshotNames))
+		if err != nil {
+			return err
+		}
+
+		filesUnreadable += unreadable
 	}
 
 	// Print overall summary if multiple snapshots
@@ -167,10 +154,13 @@ func (v *Vaultik) CreateSnapshot(opts *SnapshotCreateOptions) error {
 	}
 
 	switch {
-	case opts.Prune && (filesUnreadable > 0 || len(emptyPaths) > 0 ||
+	case opts.Prune && filesUnreadable > 0:
-		len(unmountedPaths) > 0):
+		// An older snapshot may be the only one that still holds a file
-		return v.skipPostBackupPrune(
+		// this run could not read.
-			filesUnreadable, emptyPaths, unmountedPaths)
+		log.Warn("Skipping post-backup prune",
+			"files_unreadable", filesUnreadable)
+		v.UI.Warningf("Skipped the post-backup prune because %d file(s) "+
+			"could not be read; older snapshots are kept.", filesUnreadable)
 	case opts.Prune:
 		err = v.runPostBackupPrune(snapshotNames, opts.KeepNewerThan)
 		if err != nil {
@@ -181,84 +171,6 @@ func (v *Vaultik) CreateSnapshot(opts *SnapshotCreateOptions) error {
 	return v.finishCreateSnapshot(filesUnreadable)
 }
 
-// createNamedSnapshots creates each named snapshot in turn. It returns
-// the number of entries --skip-errors skipped because it could not read
-// or list them, each configured path in which the scan found nothing,
-// and, under --prune, each directory where an earlier snapshot found a
-// volume mounted and this run did not, the paths named with their
-// snapshot.
-func (v *Vaultik) createNamedSnapshots(
-	opts *SnapshotCreateOptions, hostname string, snapshotNames []string,
-) (int, []string, []string, error) {
-	filesUnreadable := 0
-
-	var emptyPaths, unmountedPaths []string
-
-	for snapIdx, snapName := range snapshotNames {
-		stats, err := v.createNamedSnapshot(
-			opts, hostname, snapName, snapIdx+1, len(snapshotNames))
-		if err != nil {
-			return 0, nil, nil, err
-		}
-
-		filesUnreadable += stats.totalFilesUnreadable
-
-		for _, dir := range stats.emptyPaths {
-			emptyPaths = append(emptyPaths, dir+" of snapshot "+snapName)
-		}
-
-		for _, dir := range stats.unmountedPaths {
-			unmountedPaths = append(unmountedPaths,
-				dir+" of snapshot "+snapName)
-		}
-	}
-
-	return filesUnreadable, emptyPaths, unmountedPaths, nil
-}
-
-// skipPostBackupPrune says why the post-backup prune does not run, naming
-// every cause, and returns the error the run ends with. An older snapshot
-// may be the only one that still holds a file this run could not read,
-// or what an empty path or a volume that is not mounted held. The
-// previous snapshot is no guide: after one such run it lacks them too.
-func (v *Vaultik) skipPostBackupPrune(
-	filesUnreadable int, emptyPaths, unmountedPaths []string,
-) error {
-	log.Warn("Skipping post-backup prune",
-		"files_unreadable", filesUnreadable, "empty_paths", emptyPaths,
-		"unmounted_paths", unmountedPaths)
-
-	if len(emptyPaths) > 0 {
-		v.UI.Warningf("Skipped the post-backup prune because nothing was "+
-			"found in %s; older snapshots are kept.",
-			strings.Join(emptyPaths, ", "))
-	}
-
-	if len(unmountedPaths) > 0 {
-		v.UI.Warningf("Skipped the post-backup prune because this backup "+
-			"did not find a mount point at %s, where an earlier snapshot "+
-			"found one: the volume is not mounted, this backup found no "+
-			"entry in it, or the directory is no longer backed up. Older "+
-			"snapshots are kept. Mount the volume again, or, if that is on "+
-			"purpose, remove the older snapshots by hand with "+
-			"'vaultik snapshot purge'.",
-			strings.Join(unmountedPaths, ", "))
-	}
-
-	if filesUnreadable > 0 {
-		v.UI.Warningf("Skipped the post-backup prune because %d file(s) "+
-			"could not be read; older snapshots are kept.", filesUnreadable)
-
-		return fmt.Errorf("%d %w", filesUnreadable, ErrFilesUnreadable)
-	}
-
-	if len(emptyPaths) > 0 {
-		return fmt.Errorf("%d %w", len(emptyPaths), ErrSourcePathEmpty)
-	}
-
-	return fmt.Errorf("%d %w", len(unmountedPaths), ErrVolumeNotMounted)
-}
-
 // finishCreateSnapshot ends a run whose snapshots are all complete and
 // kept. Like finishRestore, it returns an error when --skip-errors
 // skipped anything it could not read or list; otherwise it prints the
@@ -363,13 +275,6 @@ type snapshotStats struct {
 	// could not be read or listed.
 	totalFilesUnreadable int
 
-	// The configured paths in which the scan found nothing.
-	emptyPaths []string
-
-	// Under --prune, the directories where an earlier snapshot of the
-	// same name found a volume mounted and this one did not.
-	unmountedPaths []string
-
 	// The sizes of all blobs the snapshot references, set by
 	// finalizeSnapshotMetadata once snapshot_blobs is populated.
 	blobSize             int64
@@ -377,10 +282,11 @@ type snapshotStats struct {
 }
 
 // createNamedSnapshot creates a single named snapshot and returns the
-// statistics of its scan.
+// number of entries --skip-errors skipped because it could not read or
+// list them.
 func (v *Vaultik) createNamedSnapshot(
 	opts *SnapshotCreateOptions, hostname, snapName string, idx, total int,
-) (*snapshotStats, error) {
+) (int, error) {
 	snapshotStartTime := time.Now()
 
 	if total > 1 {
@@ -389,12 +295,12 @@ func (v *Vaultik) createNamedSnapshot(
 
 	resolvedDirs, err := v.resolveSnapshotPaths(snapName)
 	if err != nil {
-		return nil, err
+		return 0, err
 	}
 
 	previousSnapshotID, err := v.previousSnapshotID(snapName)
 	if err != nil {
-		return nil, err
+		return 0, err
 	}
 
 	scanner := v.ScannerFactory(snapshot.ScannerParams{
@@ -409,7 +315,7 @@ func (v *Vaultik) createNamedSnapshot(
 	snapshotID, err := v.SnapshotManager.CreateSnapshotWithName(
 		v.ctx, hostname, snapName, v.Globals.Version, v.Globals.Commit)
 	if err != nil {
-		return nil, fmt.Errorf("creating snapshot: %w", err)
+		return 0, fmt.Errorf("creating snapshot: %w", err)
 	}
 
 	log.Info("Beginning snapshot", "snapshot_id", snapshotID, "name", snapName)
@@ -417,12 +323,12 @@ func (v *Vaultik) createNamedSnapshot(
 
 	stats, err := v.scanAllDirectories(scanner, resolvedDirs, snapshotID)
 	if err != nil {
-		return nil, err
+		return 0, err
 	}
 
 	err = v.finalizeSnapshotMetadata(snapshotID, stats)
 	if err != nil {
-		return nil, err
+		return 0, err
 	}
 
 	log.Info("Snapshot complete",
@@ -435,55 +341,7 @@ func (v *Vaultik) createNamedSnapshot(
 
 	v.printSnapshotSummary(snapshotID, snapshotStartTime, stats)
 
-	if opts.Prune {
+	return stats.totalFilesUnreadable, nil
-		stats.unmountedPaths, err = v.findUnmountedPaths(snapName, snapshotID)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return stats, nil
-}
-
-// findUnmountedPaths returns each directory that an earlier snapshot
-// named snapName in the local index recorded as a mount point and
-// snapshot snapshotID did not, as when the volume mounted there is not
-// mounted.
-func (v *Vaultik) findUnmountedPaths(
-	snapName, snapshotID string,
-) ([]string, error) {
-	found, err := v.Repositories.Snapshots.GetMountPoints(v.ctx, snapshotID)
-	if err != nil {
-		return nil, err
-	}
-
-	snapshots, err := v.Repositories.Snapshots.ListRecent(v.ctx, listRecentLimit)
-	if err != nil {
-		return nil, fmt.Errorf("listing snapshots: %w", err)
-	}
-
-	var unmounted []string
-
-	for _, s := range snapshots {
-		if s.ID.String() == snapshotID ||
-			parseSnapshotName(s.ID.String(), s.Hostname.String()) != snapName {
-			continue
-		}
-
-		recorded, err := v.Repositories.Snapshots.GetMountPoints(
-			v.ctx, s.ID.String())
-		if err != nil {
-			return nil, err
-		}
-
-		for _, dir := range recorded {
-			if !slices.Contains(found, dir) && !slices.Contains(unmounted, dir) {
-				unmounted = append(unmounted, dir)
-			}
-		}
-	}
-
-	return unmounted, nil
 }
 
 // previousSnapshotID returns the ID of the most recent completed snapshot
@@ -505,8 +363,7 @@ func (v *Vaultik) previousSnapshotID(snapName string) (string, error) {
 }
 
 // resolveSnapshotPaths resolves source directories to absolute paths
-// with symlink resolution. A path that is a symlink whose target does
+// with symlink resolution.
-// not exist is an error.
 func (v *Vaultik) resolveSnapshotPaths(snapName string) ([]string, error) {
 	snapConfig := v.Config.Snapshots[snapName]
 	resolvedDirs := make([]string, 0, len(snapConfig.Paths))
@@ -519,18 +376,12 @@ func (v *Vaultik) resolveSnapshotPaths(snapName string) ([]string, error) {
 
 		resolvedPath, err := filepath.EvalSymlinks(absPath)
 		if err != nil {
-			// A path that does not exist is left for the scan to report.
+			if os.IsNotExist(err) {
-			// One that exists is a symlink whose target is gone, as one
+				resolvedPath = absPath
-			// into a volume that is not mounted: the scan would record
+			} else {
-			// only the link, and --prune would then drop the older
-			// snapshots that hold the files.
-			_, lstatErr := os.Lstat(absPath)
-			if !os.IsNotExist(err) || lstatErr == nil {
 				return nil, fmt.Errorf(
 					"failed to resolve symlinks for %s: %w", absPath, err)
 			}
-
-			resolvedPath = absPath
 		}
 
 		resolvedDirs = append(resolvedDirs, resolvedPath)
@@ -584,10 +435,6 @@ func (v *Vaultik) scanAllDirectories(
 		stats.totalBytesUploaded += result.BytesUploaded
 		stats.uploadDuration += result.UploadDuration
 
-		if result.EntriesFound == 0 {
-			stats.emptyPaths = append(stats.emptyPaths, dir)
-		}
-
 		log.Info("Directory scan complete",
 			"path", dir,
 			"files", result.FilesScanned,

internal/vaultik/snapshot_prune_test.go

@@ -1,18 +1,8 @@
 package vaultik_test
 
 import (
-	"context"
-	"os"
-	"path/filepath"
-	"syscall"
 	"testing"
 
-	"github.com/spf13/afero"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/vaultik/internal/config"
-	"sneak.berlin/go/vaultik/internal/log"
-	"sneak.berlin/go/vaultik/internal/snapshot"
 	"sneak.berlin/go/vaultik/internal/vaultik"
 )
 
@@ -35,379 +25,3 @@ func TestSnapshotCreateOptions_PruneFlag(t *testing.T) {
 		t.Error("Expected Prune to be false")
 	}
 }
-
-// A backup under --prune that finds nothing in a configured path, as in
-// the mount point of a volume that is not mounted, does not prune: run
-// after run, the snapshot that holds the files is kept with everything
-// it stored, and the run fails. That holds whether the empty path is the
-// snapshot's only path or one of two. See
-// https://git.eeqj.de/sneak/vaultik/issues/388.
-func TestBackupWithEmptySourcePathDoesNotPrune(t *testing.T) {
-	log.Initialize(log.Config{})
-	t.Parallel()
-
-	// emptied is the path, relative to the source directory, that is
-	// emptied after the first backup.
-	const (
-		snapshotName = "media"
-		emptied      = "music"
-	)
-
-	tests := []struct {
-		name  string
-		paths []string // relative to the source directory
-	}{
-		{name: "only path", paths: []string{emptied}},
-		{name: "one of two paths", paths: []string{emptied, "docs"}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			ctx := context.Background()
-			env := newDeletedCountEnv(t, map[string][]byte{
-				emptied + "/a.mp3": []byte("song a"),
-				emptied + "/b.mp3": []byte("song b"),
-				"docs/notes.txt":   []byte("notes"),
-			})
-
-			paths := make([]string, 0, len(tt.paths))
-
-			for _, rel := range tt.paths {
-				paths = append(paths, filepath.Join(env.src, rel))
-			}
-
-			env.v.Config.Snapshots[snapshotName] = config.SnapshotConfig{
-				Paths: paths,
-			}
-			env.backUp(t, snapshotName)
-
-			firstID := localSnapshotID(ctx, t, env.v.Repositories, snapshotName)
-			stored, err := env.v.Storage.List(ctx, "")
-			require.NoError(t, err)
-
-			// A volume that is not mounted leaves its mount point behind
-			// as an empty directory.
-			emptiedDir := filepath.Join(env.src, emptied)
-			require.NoError(t, os.RemoveAll(emptiedDir))
-			require.NoError(t, os.Mkdir(emptiedDir, 0o750))
-
-			for range 2 {
-				env.out.Reset()
-
-				err := env.v.CreateSnapshot(&vaultik.SnapshotCreateOptions{
-					Prune:     true,
-					Snapshots: []string{snapshotName},
-				})
-				require.ErrorIs(t, err, vaultik.ErrSourcePathEmpty)
-				assert.Contains(t, env.out.String(),
-					"Skipped the post-backup prune because nothing was found in ")
-				assert.Contains(t, env.out.String(),
-					emptied+" of snapshot "+snapshotName+";")
-				assert.NotContains(t, env.out.String(), "Running post-backup prune.")
-			}
-
-			snapshots, err := env.v.Repositories.Snapshots.ListRecent(
-				ctx, listRecentTestLimit)
-			require.NoError(t, err)
-			require.Len(t, snapshots, 3)
-			assert.Equal(t, firstID, snapshots[2].ID.String(),
-				"the snapshot that holds the files is kept")
-
-			for _, key := range stored {
-				_, err := env.v.Storage.Stat(ctx, key)
-				require.NoError(t, err, "%s is kept", key)
-			}
-		})
-	}
-}
-
-// A backup under --prune of a configured path that is a symlink whose
-// target is gone, as one into a volume that is not mounted, fails before
-// anything is pruned: the snapshot that holds the files is kept with
-// everything it stored. See https://git.eeqj.de/sneak/vaultik/issues/388.
-func TestBackupThroughSymlinkWhoseTargetIsGoneDoesNotPrune(t *testing.T) {
-	log.Initialize(log.Config{})
-	t.Parallel()
-
-	const snapshotName = "photos"
-
-	ctx := context.Background()
-	env := newDeletedCountEnv(t, map[string][]byte{
-		"volume/a.jpg": []byte("photo a"),
-		"volume/b.jpg": []byte("photo b"),
-	})
-
-	target := filepath.Join(env.src, "volume")
-	link := filepath.Join(env.src, "photos")
-	require.NoError(t, os.Symlink(target, link))
-	env.setSnapshot(snapshotName, "photos")
-	env.backUp(t, snapshotName)
-
-	firstID := localSnapshotID(ctx, t, env.v.Repositories, snapshotName)
-	stored, err := env.v.Storage.List(ctx, "")
-	require.NoError(t, err)
-
-	// The volume is not mounted, so the symlink points at nothing.
-	require.NoError(t, os.RemoveAll(target))
-
-	env.out.Reset()
-	err = env.v.CreateSnapshot(&vaultik.SnapshotCreateOptions{
-		Prune:     true,
-		Snapshots: []string{snapshotName},
-	})
-	require.ErrorIs(t, err, os.ErrNotExist)
-	assert.Contains(t, err.Error(), link)
-	assert.NotContains(t, env.out.String(), "Running post-backup prune.")
-
-	snapshots, err := env.v.Repositories.Snapshots.ListRecent(
-		ctx, listRecentTestLimit)
-	require.NoError(t, err)
-	require.Len(t, snapshots, 1)
-	assert.Equal(t, firstID, snapshots[0].ID.String(),
-		"the snapshot that holds the files is kept")
-
-	for _, key := range stored {
-		_, err := env.v.Storage.Stat(ctx, key)
-		require.NoError(t, err, "%s is kept", key)
-	}
-}
-
-// A backup under --skip-errors --prune that both skipped a file it could
-// not read and found nothing in a configured path names the empty path
-// too when it skips the prune. See
-// https://git.eeqj.de/sneak/vaultik/issues/388.
-func TestBackupWithEmptySourcePathAndUnreadableFileNamesBoth(t *testing.T) {
-	log.Initialize(log.Config{})
-	t.Parallel()
-
-	const snapshotName = "media"
-
-	env := newDeletedCountEnv(t, map[string][]byte{
-		"docs/notes.txt": []byte("notes"),
-	})
-	require.NoError(t, os.Mkdir(filepath.Join(env.src, "music"), 0o750))
-	env.v.Config.Snapshots[snapshotName] = config.SnapshotConfig{
-		Paths: []string{
-			filepath.Join(env.src, "docs"),
-			filepath.Join(env.src, "music"),
-		},
-	}
-
-	// A mode does not lock out root, who runs the tests, so opening the
-	// file is made to fail instead.
-	env.v.Fs = &openFailFs{
-		path: filepath.Join(env.src, "docs", "notes.txt"),
-		err:  os.ErrPermission,
-	}
-
-	err := env.v.CreateSnapshot(&vaultik.SnapshotCreateOptions{
-		Prune:      true,
-		SkipErrors: true,
-		Snapshots:  []string{snapshotName},
-	})
-	require.ErrorIs(t, err, vaultik.ErrFilesUnreadable)
-	assert.Contains(t, env.out.String(),
-		"Skipped the post-backup prune because 1 file(s) could not be read")
-	assert.Contains(t, env.out.String(),
-		"Skipped the post-backup prune because nothing was found in ")
-	assert.Contains(t, env.out.String(), "music of snapshot "+snapshotName+";")
-	assert.NotContains(t, env.out.String(), "Running post-backup prune.")
-}
-
-// A backup under --prune that finds something in each configured path
-// prunes the previous snapshot, also when a path is a single file. See
-// https://git.eeqj.de/sneak/vaultik/issues/388.
-func TestBackupWithNoEmptySourcePathPrunes(t *testing.T) {
-	log.Initialize(log.Config{})
-	t.Parallel()
-
-	const (
-		snapshotName = "album"
-		file         = "pictures/one.jpg" // relative to the source directory
-	)
-
-	tests := []struct {
-		name string
-		path string // relative to the source directory
-	}{
-		{name: "directory", path: filepath.Dir(file)},
-		{name: "single file", path: file},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			ctx := context.Background()
-			env := newDeletedCountEnv(t, map[string][]byte{
-				file: []byte("picture"),
-			})
-			env.setSnapshot(snapshotName, tt.path)
-			env.backUp(t, snapshotName)
-
-			firstID := localSnapshotID(ctx, t, env.v.Repositories, snapshotName)
-
-			require.NoError(t, env.v.CreateSnapshot(&vaultik.SnapshotCreateOptions{
-				Prune:     true,
-				Snapshots: []string{snapshotName},
-			}))
-
-			snapshots, err := env.v.Repositories.Snapshots.ListRecent(
-				ctx, listRecentTestLimit)
-			require.NoError(t, err)
-			require.Len(t, snapshots, 1, "the previous snapshot is pruned")
-			assert.NotEqual(t, firstID, snapshots[0].ID.String())
-		})
-	}
-}
-
-// automountFs is the real filesystem with a volume at volumeDir that is
-// mounted on first access, as by an autofs map that shows its mount
-// points before mounting them: listing volumeDir mounts the volume or,
-// while cannotMount, fails with "no such file or directory".
-type automountFs struct {
-	afero.OsFs
-
-	volumeDir   string
-	cannotMount bool
-	mounted     bool
-}
-
-//nolint:ireturn // afero.Fs.Open is defined to return the interface.
-func (f *automountFs) Open(name string) (afero.File, error) {
-	if name == f.volumeDir && f.cannotMount {
-		return nil, &os.PathError{Op: "open", Path: name, Err: syscall.ENOENT}
-	}
-
-	if name == f.volumeDir {
-		f.mounted = true
-	}
-
-	return f.OsFs.Open(name)
-}
-
-// A backup under --prune in which a volume that an earlier snapshot found
-// mounted below the configured path is missing does not prune: run after
-// run, the snapshot that holds the volume's files is kept with everything
-// it stored, and the run fails. Once the volume is back, the prune runs.
-// The volume is mounted on first access and every backup starts with it
-// not mounted, so its directory is on its parent's device until the walk
-// lists it. While the volume is missing, its directory is left empty, or
-// listing it fails with "no such file or directory", as when an autofs
-// volume cannot be mounted, which the walk counts as a directory removed
-// during the backup. See https://git.eeqj.de/sneak/vaultik/issues/395.
-func TestBackupWithVolumeNotMountedDoesNotPrune(t *testing.T) {
-	log.Initialize(log.Config{})
-	t.Parallel()
-
-	tests := []struct {
-		name         string
-		listingFails bool
-	}{
-		{name: "directory left empty", listingFails: false},
-		{name: "listing fails", listingFails: true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			backUpWithVolumeNotMounted(t, tt.listingFails)
-		})
-	}
-}
-
-// backUpWithVolumeNotMounted runs the backups of
-// TestBackupWithVolumeNotMountedDoesNotPrune. While the volume is
-// missing, listing its directory fails if listingFails; otherwise the
-// directory is empty.
-func backUpWithVolumeNotMounted(t *testing.T, listingFails bool) {
-	t.Helper()
-
-	// volume is the directory, below the configured path, where the
-	// volume is mounted.
-	const (
-		snapshotName = "data"
-		volume       = "nas"
-	)
-
-	ctx := context.Background()
-	env := newDeletedCountEnv(t, map[string][]byte{
-		volume + "/a.txt": []byte("file a"),
-		"notes.txt":       []byte("notes"),
-	})
-	env.setSnapshot(snapshotName, "")
-	prune := &vaultik.SnapshotCreateOptions{
-		Prune: true, Snapshots: []string{snapshotName},
-	}
-
-	// The volume's directory is on the volume's device, 2, while the
-	// volume is mounted. Everything else is on device 1.
-	volumeDir := filepath.Join(env.src, volume)
-	fs := &automountFs{volumeDir: volumeDir}
-	newScanner := env.v.ScannerFactory
-	env.v.ScannerFactory = func(params snapshot.ScannerParams) *snapshot.Scanner {
-		fs.mounted = false
-		params.Fs = fs
-		params.DeviceNumber = func(info os.FileInfo) (uint64, bool) {
-			if info.Name() == volume && fs.mounted {
-				return 2, true
-			}
-
-			return 1, true
-		}
-
-		return newScanner(params)
-	}
-
-	env.backUp(t, snapshotName)
-
-	firstID := localSnapshotID(ctx, t, env.v.Repositories, snapshotName)
-	stored, err := env.v.Storage.List(ctx, "")
-	require.NoError(t, err)
-
-	// The volume goes missing.
-	fs.cannotMount = listingFails
-
-	if !listingFails {
-		require.NoError(t, os.RemoveAll(volumeDir))
-		require.NoError(t, os.Mkdir(volumeDir, 0o750))
-	}
-
-	for range 2 {
-		env.out.Reset()
-
-		err := env.v.CreateSnapshot(prune)
-		require.ErrorIs(t, err, vaultik.ErrVolumeNotMounted)
-		assert.Contains(t, env.out.String(),
-			"did not find a mount point at "+volumeDir+" of snapshot "+snapshotName)
-		assert.Contains(t, env.out.String(), "'vaultik snapshot purge'")
-		assert.NotContains(t, env.out.String(), "Running post-backup prune.")
-	}
-
-	snapshots, err := env.v.Repositories.Snapshots.ListRecent(
-		ctx, listRecentTestLimit)
-	require.NoError(t, err)
-	require.Len(t, snapshots, 3)
-	assert.Equal(t, firstID, snapshots[2].ID.String(),
-		"the snapshot that holds the volume's files is kept")
-
-	for _, key := range stored {
-		_, err := env.v.Storage.Stat(ctx, key)
-		require.NoError(t, err, "%s is kept", key)
-	}
-
-	// The volume is back.
-	fs.cannotMount = false
-
-	require.NoError(t, os.WriteFile(
-		filepath.Join(volumeDir, "a.txt"), []byte("file a"), 0o600))
-	require.NoError(t, env.v.CreateSnapshot(prune))
-
-	snapshots, err = env.v.Repositories.Snapshots.ListRecent(
-		ctx, listRecentTestLimit)
-	require.NoError(t, err)
-	require.Len(t, snapshots, 1, "the older snapshots are pruned")
-}