fd95511091
Before this change, bisync needed to build a full listing for Path1, then a full listing for Path2, then compare them -- and each of those tasks needed to finish before the next one could start. In addition to being slow and inefficient, it also caused real problems if a file changed between the time bisync checked it on Path1 and the time it checked the corresponding file on Path2. This change solves these problems by listing both paths concurrently, using the same March infrastructure that check and sync use to traverse two directories in lock-step, optimized by Go's robust concurrency support. Listings should now be much faster, and any given path is now checked nearly-instantaneously on both sides, minimizing room for error. Further discussion: https://forum.rclone.org/t/bisync-bugs-and-feature-requests/37636#:~:text=4.%20Listings%20should%20alternate%20between%20paths%20to%20minimize%20errors
93 lines
4.9 KiB
Text
93 lines
4.9 KiB
Text
[36m(01) :[0m [34mtest resync[0m
|
|
|
|
|
|
[36m(02) :[0m [34mtest 1. resync with empty path1, resulting in copying all content from path2.[0m
|
|
[36m(03) :[0m [34mpurge-children {path1/}[0m
|
|
[36m(04) :[0m [34mbisync resync[0m
|
|
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
|
|
INFO : Copying unique Path2 files to Path1
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mRCLONE_TEST[0m
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mfile1.txt[0m
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mfile2.txt[0m
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mfile3.txt[0m
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mfile4.txt[0m
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mfile5.txt[0m
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mfile6.txt[0m
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mfile7.txt[0m
|
|
INFO : - [34mPath2[0m [35mResync is doing queued copies to[0m - [36mPath1[0m
|
|
INFO : Resynching Path1 to Path2
|
|
INFO : Resync updating listings
|
|
INFO : [32mBisync successful[0m
|
|
[36m(05) :[0m [34mmove-listings empty-path1[0m
|
|
|
|
[36m(06) :[0m [34mtest 2. resync with empty path2, resulting in synching all content to path2.[0m
|
|
[36m(07) :[0m [34mpurge-children {path2/}[0m
|
|
[36m(08) :[0m [34mbisync resync[0m
|
|
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
|
|
INFO : Copying unique Path2 files to Path1
|
|
INFO : Resynching Path1 to Path2
|
|
INFO : Resync updating listings
|
|
INFO : [32mBisync successful[0m
|
|
[36m(09) :[0m [34mmove-listings empty-path2[0m
|
|
|
|
[36m(10) :[0m [34mtest 3. exercise all of the various file difference scenarios during a resync.[0m
|
|
[36m(11) :[0m [34mtouch-glob 2002-02-02 {datadir/} fileA.txt[0m
|
|
[36m(12) :[0m [34mtouch-glob 1999-09-09 {datadir/} fileB.txt[0m
|
|
|
|
[36m(13) :[0m [34mtest = file - path1 - path2 - expected action - who wins[0m
|
|
[36m(14) :[0m [34mtest - file1.txt - exists - missing - sync path1 > path2 - path1[0m
|
|
[36m(15) :[0m [34mdelete-file {path2/}file1.txt[0m
|
|
|
|
[36m(16) :[0m [34mtest - file2.txt - missing - exists - copy path2 > path1 - path2[0m
|
|
[36m(17) :[0m [34mdelete-file {path1/}file2.txt[0m
|
|
|
|
[36m(18) :[0m [34mtest - file3.txt - exists - newer date - sync path1 > path2 - path1[0m
|
|
[36m(19) :[0m [34mcopy-as {datadir/}fileA.txt {path2/} file3.txt[0m
|
|
|
|
[36m(20) :[0m [34mtest - file4.txt - missing - newer date - copy path2 > path1 - path2[0m
|
|
[36m(21) :[0m [34mdelete-file {path1/}file4.txt[0m
|
|
[36m(22) :[0m [34mcopy-as {datadir/}fileA.txt {path2/} file4.txt[0m
|
|
|
|
[36m(23) :[0m [34mtest - file5.txt - exists - older date - sync path1 > path2 - path1[0m
|
|
[36m(24) :[0m [34mcopy-as {datadir/}fileB.txt {path2/} file5.txt[0m
|
|
|
|
[36m(25) :[0m [34mtest - file6.txt - older date - newer date - sync path1 > path2 - path1[0m
|
|
[36m(26) :[0m [34mcopy-as {datadir/}fileB.txt {path1/} file6.txt[0m
|
|
[36m(27) :[0m [34mcopy-as {datadir/}fileA.txt {path2/} file6.txt[0m
|
|
|
|
[36m(28) :[0m [34mtest - file7.txt - exists - exists (same) - none - same[0m
|
|
|
|
[36m(29) :[0m [34mtest run bisync with resync[0m
|
|
[36m(30) :[0m [34mbisync resync[0m
|
|
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
|
|
INFO : Copying unique Path2 files to Path1
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mfile2.txt[0m
|
|
INFO : - [34mPath2[0m [35mResync will copy to Path1[0m - [36mfile4.txt[0m
|
|
INFO : - [34mPath2[0m [35mResync is doing queued copies to[0m - [36mPath1[0m
|
|
INFO : Resynching Path1 to Path2
|
|
INFO : Resync updating listings
|
|
INFO : [32mBisync successful[0m
|
|
[36m(31) :[0m [34mcopy-listings mixed-diffs[0m
|
|
|
|
[36m(32) :[0m [34mtest run normal bisync[0m
|
|
[36m(33) :[0m [34mbisync[0m
|
|
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 : [32mBisync successful[0m
|
|
|
|
[36m(34) :[0m [34mtest 4. confirm critical error on normal sync of empty path.[0m
|
|
[36m(35) :[0m [34mpurge-children {path2/}[0m
|
|
[36m(36) :[0m [34mbisync[0m
|
|
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 : [31mBisync critical error: empty current Path2 listing: {workdir/}{session}.path2.lst-new[0m
|
|
ERROR : [31mBisync aborted. Must run --resync to recover.[0m
|
|
Bisync error: bisync aborted
|