mirror of
https://github.com/rclone/rclone.git
synced 2024-12-23 04:10:31 +08:00
b4216648e4
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.
5.6 KiB
5.6 KiB
(01) : test resync
(02) : test 1. resync with empty path1, resulting in copying all content from path2.
(03) : purge-children {path1/}
(04) : bisync resync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
(05) : move-listings empty-path1
(06) : test 2. resync with empty path2, resulting in synching all content to path2.
(07) : purge-children {path2/}
(08) : bisync resync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
(09) : move-listings empty-path2
(10) : test 3. exercise all of the various file difference scenarios during a resync.
(11) : touch-glob 2002-02-02 {datadir/} fileA.txt
(12) : touch-glob 1999-09-09 {datadir/} fileB.txt
(13) : test = file - path1 - path2 - expected action - who wins
(14) : test - file1.txt - exists - missing - sync path1 > path2 - path1
(15) : delete-file {path2/}file1.txt
(16) : test - file2.txt - missing - exists - copy path2 > path1 - path2
(17) : delete-file {path1/}file2.txt
(18) : test - file3.txt - exists - newer date - sync path1 > path2 - path1
(19) : copy-as {datadir/}fileA.txt {path2/} file3.txt
(20) : test - file4.txt - missing - newer date - copy path2 > path1 - path2
(21) : delete-file {path1/}file4.txt
(22) : copy-as {datadir/}fileA.txt {path2/} file4.txt
(23) : test - file5.txt - exists - older date - sync path1 > path2 - path1
(24) : copy-as {datadir/}fileB.txt {path2/} file5.txt
(25) : test - file6.txt - older date - newer date - sync path1 > path2 - path1
(26) : copy-as {datadir/}fileB.txt {path1/} file6.txt
(27) : copy-as {datadir/}fileA.txt {path2/} file6.txt
(28) : test - file7.txt - exists - exists (same) - none - same
(29) : test run bisync with resync
(30) : bisync resync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
(31) : copy-listings mixed-diffs
(32) : test run normal bisync
(33) : bisync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : Path2 checking for diffs
INFO : No changes found
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(34) : test 4. confirm critical error on normal sync of empty path.
(35) : purge-children {path2/}
(36) : bisync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : Path2 checking for diffs
ERROR : Empty current Path2 listing. Cannot sync to an empty directory: {workdir/}{session}.path2.lst-new
ERROR : Bisync critical error: empty current Path2 listing: {workdir/}{session}.path2.lst-new
ERROR : Bisync aborted. Must run --resync to recover.
Bisync error: bisync aborted
(02) : test 1. resync with empty path1, resulting in copying all content from path2.
(03) : purge-children {path1/}
(04) : bisync resync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
(05) : move-listings empty-path1
(06) : test 2. resync with empty path2, resulting in synching all content to path2.
(07) : purge-children {path2/}
(08) : bisync resync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
(09) : move-listings empty-path2
(10) : test 3. exercise all of the various file difference scenarios during a resync.
(11) : touch-glob 2002-02-02 {datadir/} fileA.txt
(12) : touch-glob 1999-09-09 {datadir/} fileB.txt
(13) : test = file - path1 - path2 - expected action - who wins
(14) : test - file1.txt - exists - missing - sync path1 > path2 - path1
(15) : delete-file {path2/}file1.txt
(16) : test - file2.txt - missing - exists - copy path2 > path1 - path2
(17) : delete-file {path1/}file2.txt
(18) : test - file3.txt - exists - newer date - sync path1 > path2 - path1
(19) : copy-as {datadir/}fileA.txt {path2/} file3.txt
(20) : test - file4.txt - missing - newer date - copy path2 > path1 - path2
(21) : delete-file {path1/}file4.txt
(22) : copy-as {datadir/}fileA.txt {path2/} file4.txt
(23) : test - file5.txt - exists - older date - sync path1 > path2 - path1
(24) : copy-as {datadir/}fileB.txt {path2/} file5.txt
(25) : test - file6.txt - older date - newer date - sync path1 > path2 - path1
(26) : copy-as {datadir/}fileB.txt {path1/} file6.txt
(27) : copy-as {datadir/}fileA.txt {path2/} file6.txt
(28) : test - file7.txt - exists - exists (same) - none - same
(29) : test run bisync with resync
(30) : bisync resync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
(31) : copy-listings mixed-diffs
(32) : test run normal bisync
(33) : bisync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : Path2 checking for diffs
INFO : No changes found
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(34) : test 4. confirm critical error on normal sync of empty path.
(35) : purge-children {path2/}
(36) : bisync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
"Size": true,
"Checksum": false,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": false
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : Path2 checking for diffs
ERROR : Empty current Path2 listing. Cannot sync to an empty directory: {workdir/}{session}.path2.lst-new
ERROR : Bisync critical error: empty current Path2 listing: {workdir/}{session}.path2.lst-new
ERROR : Bisync aborted. Must run --resync to recover.
Bisync error: bisync aborted