"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
cmd: refactor --retries and --retries-sleep to global config
nielash407a0f3733c4
diff --git a/cmd/cmd.go b/cmd/cmd.goindex 784d785e9..65873bfb5 100644--- a/cmd/cmd.go+++ b/cmd/cmd.go@@ -47,13 +47,11 @@ import (// Globalsvar (// Flags- cpuProfile = flags.StringP("cpuprofile", "", "", "Write cpu profile to file", "Debugging")- memProfile = flags.StringP("memprofile", "", "", "Write memory profile to file", "Debugging")- statsInterval = flags.DurationP("stats", "", time.Minute*1, "Interval between printing stats, e.g. 500ms, 60s, 5m (0 to disable)", "Logging")- dataRateUnit = flags.StringP("stats-unit", "", "bytes", "Show data rate in stats as either 'bits' or 'bytes' per second", "Logging")- version bool- retries = flags.IntP("retries", "", 3, "Retry operations this many times if they fail", "Config")- retriesInterval = flags.DurationP("retries-sleep", "", 0, "Interval between retrying operations if they fail, e.g. 500ms, 60s, 5m (0 to disable)", "Config")+ cpuProfile = flags.StringP("cpuprofile", "", "", "Write cpu profile to file", "Debugging")+ memProfile = flags.StringP("memprofile", "", "", "Write memory profile to file", "Debugging")+ statsInterval = flags.DurationP("stats", "", time.Minute*1, "Interval between printing stats, e.g. 500ms, 60s, 5m (0 to disable)", "Logging")+ dataRateUnit = flags.StringP("stats-unit", "", "bytes", "Show data rate in stats as either 'bits' or 'bytes' per second", "Logging")+ version bool// ErrorserrorCommandNotFound = errors.New("command not found")errorUncategorized = errors.New("uncategorized error")@@ -253,7 +251,7 @@ func Run(Retry bool, showStats bool, cmd *cobra.Command, f func() error) {stopStats = StartStats()}SigInfoHandler()- for try := 1; try <= *retries; try++ {+ for try := 1; try <= ci.Retries; try++ {cmdErr = f()cmdErr = fs.CountError(cmdErr)lastErr := accounting.GlobalStats().GetLastError()@@ -262,7 +260,7 @@ func Run(Retry bool, showStats bool, cmd *cobra.Command, f func() error) {}if !Retry || !accounting.GlobalStats().Errored() {if try > 1 {- fs.Errorf(nil, "Attempt %d/%d succeeded", try, *retries)+ fs.Errorf(nil, "Attempt %d/%d succeeded", try, ci.Retries)}break}@@ -282,15 +280,15 @@ func Run(Retry bool, showStats bool, cmd *cobra.Command, f func() error) {}}if lastErr != nil {- fs.Errorf(nil, "Attempt %d/%d failed with %d errors and: %v", try, *retries, accounting.GlobalStats().GetErrors(), lastErr)+ fs.Errorf(nil, "Attempt %d/%d failed with %d errors and: %v", try, ci.Retries, accounting.GlobalStats().GetErrors(), lastErr)} else {- fs.Errorf(nil, "Attempt %d/%d failed with %d errors", try, *retries, accounting.GlobalStats().GetErrors())+ fs.Errorf(nil, "Attempt %d/%d failed with %d errors", try, ci.Retries, accounting.GlobalStats().GetErrors())}- if try < *retries {+ if try < ci.Retries {accounting.GlobalStats().ResetErrors()}- if *retriesInterval > 0 {- time.Sleep(*retriesInterval)+ if ci.RetriesInterval > 0 {+ time.Sleep(ci.RetriesInterval)}}stopStats()@@ -339,7 +337,6 @@ func Run(Retry bool, showStats bool, cmd *cobra.Command, f func() error) {}}resolveExitCode(cmdErr)-}// CheckArgs checks there are enough arguments and prints a message if not@@ -554,7 +551,7 @@ func AddBackendFlags() {} else {fs.Errorf(nil, "Not adding duplicate flag --%s", name)}- //flag.Hidden = true+ // flag.Hidden = true}}}diff --git a/fs/config.go b/fs/config.goindex 5b1e483dc..5deb921fd 100644--- a/fs/config.go+++ b/fs/config.go@@ -72,8 +72,10 @@ type ConfigInfo struct {DeleteMode DeleteModeMaxDelete int64MaxDeleteSize SizeSuffix- TrackRenames bool // Track file renames.- TrackRenamesStrategy string // Comma separated list of strategies used to track renames+ TrackRenames bool // Track file renames.+ TrackRenamesStrategy string // Comma separated list of strategies used to track renames+ Retries int // High-level retries+ RetriesInterval time.Duration // --retries-sleepLowLevelRetries intUpdateOlder bool // Skip files that are newer on the destinationNoGzip bool // Disable compression@@ -171,6 +173,7 @@ func NewConfig() *ConfigInfo {c.DeleteMode = DeleteModeDefaultc.MaxDelete = -1c.MaxDeleteSize = SizeSuffix(-1)+ c.Retries = 3c.LowLevelRetries = 10c.MaxDepth = -1c.DataRateUnit = "bytes"diff --git a/fs/config/configflags/configflags.go b/fs/config/configflags/configflags.goindex 232af61d5..ce891f2b4 100644--- a/fs/config/configflags/configflags.go+++ b/fs/config/configflags/configflags.go@@ -75,6 +75,8 @@ func AddFlags(ci *fs.ConfigInfo, flagSet *pflag.FlagSet) {flags.FVarP(flagSet, &ci.MaxDeleteSize, "max-delete-size", "", "When synchronizing, limit the total size of deletes", "Sync")flags.BoolVarP(flagSet, &ci.TrackRenames, "track-renames", "", ci.TrackRenames, "When synchronizing, track file renames and do a server-side move if possible", "Sync")flags.StringVarP(flagSet, &ci.TrackRenamesStrategy, "track-renames-strategy", "", ci.TrackRenamesStrategy, "Strategies to use when synchronizing using track-renames hash|modtime|leaf", "Sync")+ flags.IntVarP(flagSet, &ci.Retries, "retries", "", 3, "Retry operations this many times if they fail", "Config")+ flags.DurationVarP(flagSet, &ci.RetriesInterval, "retries-sleep", "", 0, "Interval between retrying operations if they fail, e.g. 500ms, 60s, 5m (0 to disable)", "Config")flags.IntVarP(flagSet, &ci.LowLevelRetries, "low-level-retries", "", ci.LowLevelRetries, "Number of low level retries to do", "Config")flags.BoolVarP(flagSet, &ci.UpdateOlder, "update", "u", ci.UpdateOlder, "Skip files that are newer on the destination", "Copy")flags.BoolVarP(flagSet, &ci.UseServerModTime, "use-server-modtime", "", ci.UseServerModTime, "Use server modified time instead of object metadata", "Config")