MirrorSave
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restic backup - remove unneeded code and improve error information 

remove unneded field RepoSizeMax

Improve code at the end of the run showing if repository capacity has been
exceeded and give current value.
This commit is contained in:
Winfried Plappert 2025-03-03 06:56:03 +00:00
parent 8c35a6d76d
commit 1abf1aafc8
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/restic/cmd_backup.go
View File

@ -116,8 +116,7 @@ type BackupOptions struct {
ReadConcurrency uint ReadConcurrency uint
NoScan bool NoScan bool
SkipIfUnchanged bool SkipIfUnchanged bool
RepoMaxSizeString string RepoMaxSize string
RepoSizeMax uint64
} }
func (opts *BackupOptions) AddFlags(f *pflag.FlagSet) { func (opts *BackupOptions) AddFlags(f *pflag.FlagSet) {
@ -158,7 +157,7 @@ func (opts *BackupOptions) AddFlags(f *pflag.FlagSet) {
f.BoolVar(&opts.ExcludeCloudFiles, "exclude-cloud-files", false, "excludes online-only cloud files (such as OneDrive Files On-Demand)") f.BoolVar(&opts.ExcludeCloudFiles, "exclude-cloud-files", false, "excludes online-only cloud files (such as OneDrive Files On-Demand)")
} }
f.BoolVar(&opts.SkipIfUnchanged, "skip-if-unchanged", false, "skip snapshot creation if identical to parent snapshot") f.BoolVar(&opts.SkipIfUnchanged, "skip-if-unchanged", false, "skip snapshot creation if identical to parent snapshot")
f.StringVar(&opts.RepoMaxSizeString, "max-repo-size", "", "`limit` maximum size of repository - absolute value in bytes with suffixes m/M, g/G, t/T, default unlimited") f.StringVar(&opts.RepoMaxSize, "max-repo-size", "", "`limit` maximum size of repository - absolute value in bytes with suffixes m/M, g/G, t/T, default unlimited")
// parse read concurrency from env, on error the default value will be used // parse read concurrency from env, on error the default value will be used
readConcurrency, _ := strconv.ParseUint(os.Getenv("RESTIC_READ_CONCURRENCY"), 10, 32) readConcurrency, _ := strconv.ParseUint(os.Getenv("RESTIC_READ_CONCURRENCY"), 10, 32)
@ -522,8 +521,8 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
} }
} }
if len(opts.RepoMaxSizeString) > 0 { if len(opts.RepoMaxSize) > 0 {
size, err := ui.ParseBytes(opts.RepoMaxSizeString) size, err := ui.ParseBytes(opts.RepoMaxSize)
if err != nil { if err != nil {
return err return err
} }
@ -721,21 +720,23 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
return errors.Fatalf("unable to save snapshot: %v", err) return errors.Fatalf("unable to save snapshot: %v", err)
} }
if repo.MaxCapacityExceeded() {
Printf("\n=========================================\n")
Printf("repository maximum size has been exceeded\n")
curRepoSize, err := repo.CurrentRepositorySize(ctx)
if err != nil {
return err
}
Printf("Current repository size is %s\n", ui.FormatBytes(curRepoSize))
Printf("=========================================\n\n")
}
// Report finished execution // Report finished execution
progressReporter.Finish(id, summary, opts.DryRun) progressReporter.Finish(id, summary, opts.DryRun)
if !success { if !success {
return ErrInvalidSourceData return ErrInvalidSourceData
} }
if repo.MaxCapacityExceeded() {
Verbosef("repository maximum size has been exceeded\n")
curRepoSize, err := repo.CurrentRepositorySize(ctx)
if err != nil {
return err
}
Verbosef("Current repository size is %s\n", ui.FormatBytes(curRepoSize))
}
// Return error if any // Return error if any
return werr return werr
} }