bisync: full support for comparing checksum, size, modtime - fixes #5679 fixes #5683 fixes #5684 fixes #5675
Before this change, bisync could only detect changes based on modtime, and would refuse to run if either path lacked modtime support. This made bisync unavailable for many of rclone's backends. Additionally, bisync did not account for the Fs's precision when comparing modtimes, meaning that they could only be reliably compared within the same side -- not against the opposite side. Size and checksum (even when available) were ignored completely for deltas. After this change, bisync now fully supports comparing based on any combination of size, modtime, and checksum, lifting the prior restriction on backends without modtime support. The comparison logic considers the backend's precision, hash types, and other features as appropriate. The comparison features optionally use a new --compare flag (which takes any combination of size,modtime,checksum) and even supports some combinations not otherwise supported in `sync` (like comparing all three at the same time.) By default (without the --compare flag), bisync inherits the same comparison options as `sync` (that is: size and modtime by default, unless modified with flags such as --checksum or --size-only.) If the --compare flag is set, it will override these defaults. If --compare includes checksum and both remotes support checksums but have no hash types in common with each other, checksums will be considered only for comparisons within the same side (to determine what has changed since the prior sync), but not for comparisons against the opposite side. If one side supports checksums and the other does not, checksums will only be considered on the side that supports them. When comparing with checksum and/or size without modtime, bisync cannot determine whether a file is newer or older -- only whether it is changed or unchanged. (If it is changed on both sides, bisync still does the standard equality-check to avoid declaring a sync conflict unless it absolutely has to.) Also included are some new flags to customize the checksum comparison behavior on backends where hashes are slow or unavailable. --no-slow-hash and --slow-hash-sync-only allow selectively ignoring checksums on backends such as local where they are slow. --download-hash allows computing them by downloading when (and only when) they're otherwise not available. Of course, this option probably won't be practical with large files, but may be a good option for syncing small-but-important files with maximum accuracy (for example, a source code repo on a crypt remote.) An additional advantage over methods like cryptcheck is that the original file is not required for comparison (for example, --download-hash can be used to bisync two different crypt remotes with different passwords.) Additionally, all of the above are now considered during the final --check-sync for much-improved accuracy (before this change, it only compared filenames!) Many other details are explained in the included docs.
This commit is contained in:
@@ -180,6 +180,17 @@ func logModTimeUpload(dst fs.Object) {
|
||||
})
|
||||
}
|
||||
|
||||
// EqualFn allows replacing Equal() with a custom function during NeedTransfer()
|
||||
type EqualFn func(ctx context.Context, src fs.ObjectInfo, dst fs.Object) bool
|
||||
type equalFnContextKey struct{}
|
||||
|
||||
var equalFnKey = equalFnContextKey{}
|
||||
|
||||
// WithEqualFn stores equalFn in ctx and returns a copy of ctx in which equalFnKey = equalFn
|
||||
func WithEqualFn(ctx context.Context, equalFn EqualFn) context.Context {
|
||||
return context.WithValue(ctx, equalFnKey, equalFn)
|
||||
}
|
||||
|
||||
func equal(ctx context.Context, src fs.ObjectInfo, dst fs.Object, opt equalOpt) bool {
|
||||
ci := fs.GetConfig(ctx)
|
||||
logger, _ := GetLogger(ctx)
|
||||
@@ -790,10 +801,10 @@ func ListLong(ctx context.Context, f fs.Fs, w io.Writer) error {
|
||||
})
|
||||
}
|
||||
|
||||
// hashSum returns the human-readable hash for ht passed in. This may
|
||||
// HashSum returns the human-readable hash for ht passed in. This may
|
||||
// be UNSUPPORTED or ERROR. If it isn't returning a valid hash it will
|
||||
// return an error.
|
||||
func hashSum(ctx context.Context, ht hash.Type, base64Encoded bool, downloadFlag bool, o fs.Object) (string, error) {
|
||||
func HashSum(ctx context.Context, ht hash.Type, base64Encoded bool, downloadFlag bool, o fs.Object) (string, error) {
|
||||
var sum string
|
||||
var err error
|
||||
|
||||
@@ -881,7 +892,7 @@ func HashLister(ctx context.Context, ht hash.Type, outputBase64 bool, downloadFl
|
||||
<-concurrencyControl
|
||||
wg.Done()
|
||||
}()
|
||||
sum, err := hashSum(ctx, ht, outputBase64, downloadFlag, o)
|
||||
sum, err := HashSum(ctx, ht, outputBase64, downloadFlag, o)
|
||||
if err != nil {
|
||||
fs.Errorf(o, "%v", fs.CountError(err))
|
||||
return
|
||||
@@ -1572,6 +1583,10 @@ func NeedTransfer(ctx context.Context, dst, src fs.Object) bool {
|
||||
}
|
||||
} else {
|
||||
// Check to see if changed or not
|
||||
equalFn, ok := ctx.Value(equalFnKey).(EqualFn)
|
||||
if ok {
|
||||
return !equalFn(ctx, src, dst)
|
||||
}
|
||||
if Equal(ctx, src, dst) && !SameObject(src, dst) {
|
||||
fs.Debugf(src, "Unchanged skipping")
|
||||
return false
|
||||
|
||||
Reference in New Issue
Block a user