Exit 3 when a backup or restore finished but skipped files (closes #439)
check / check (push) In progress
check / check (push) In progress
A `snapshot create` or `snapshot restore` that --skip-errors made skip files now exits 3, the status `restic backup` uses, so a cron job can tell it from a run that made no backup (1). RunOperation keeps the operation's error inside errReported so Entry can pick the status. A run that skipped files and also found a configured path empty, missed a mount point, or was asked for a path the snapshot lacks still exits 1: its error wraps only that condition and names the skipped files in text. The README gains an exit status section. Model: opus-5-5
This commit is contained in:
1 parent
d747ddef3a
commit
7f3fb97012
9 files changed
+180
-68
No files matched your search
@@ -49,8 +49,7 @@ var ErrFilesUnreadable = errors.New("file(s) could not be read")
|
||||
// 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.
|
||||
// from a failed backup.
|
||||
var ErrSourcePathEmpty = errors.New("source path(s) were empty")
|
||||
|
||||
// ErrVolumeNotMounted is returned when --prune skipped the post-backup
|
||||
@@ -59,8 +58,8 @@ var ErrSourcePathEmpty = errors.New("source path(s) were empty")
|
||||
// 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.
|
||||
// that also found a configured path empty returns ErrSourcePathEmpty
|
||||
// instead.
|
||||
var ErrVolumeNotMounted = errors.New(
|
||||
"mount point(s) an earlier snapshot recorded were not found")
|
||||
|
||||
@@ -243,15 +242,29 @@ func (v *Vaultik) skipPostBackupPrune(
|
||||
if filesUnreadable > 0 {
|
||||
v.UI.Warningf("Skipped the post-backup prune because %d file(s) "+
|
||||
"could not be read; older snapshots are kept.", filesUnreadable)
|
||||
}
|
||||
|
||||
var err error
|
||||
|
||||
switch {
|
||||
case len(emptyPaths) > 0:
|
||||
err = fmt.Errorf("%d %w", len(emptyPaths), ErrSourcePathEmpty)
|
||||
case len(unmountedPaths) > 0:
|
||||
err = fmt.Errorf("%d %w", len(unmountedPaths), ErrVolumeNotMounted)
|
||||
default:
|
||||
return fmt.Errorf("%d %w", filesUnreadable, ErrFilesUnreadable)
|
||||
}
|
||||
|
||||
if len(emptyPaths) > 0 {
|
||||
return fmt.Errorf("%d %w", len(emptyPaths), ErrSourcePathEmpty)
|
||||
// An empty path or a missing volume can mean a whole volume is not
|
||||
// in the backup, which outweighs skipped files: the error wraps only
|
||||
// the former, so the command does not exit as a backup that only
|
||||
// skipped files.
|
||||
if filesUnreadable > 0 {
|
||||
return fmt.Errorf("%w; %d %s",
|
||||
err, filesUnreadable, ErrFilesUnreadable.Error())
|
||||
}
|
||||
|
||||
return fmt.Errorf("%d %w", len(unmountedPaths), ErrVolumeNotMounted)
|
||||
return err
|
||||
}
|
||||
|
||||
// finishCreateSnapshot ends a run whose snapshots are all complete and
|
||||
|
||||
Reference in new issue
Block a user