forked from TrueCloudLab/rclone
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
3.2 KiB
3.2 KiB
(01) : test max-delete-path1
(02) : test initial bisync
(03) : bisync resync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : Resynching Path1 to Path2
INFO : Resync updating listings
INFO : Bisync successful
(04) : test delete >50% of local files
(05) : delete-file {path1/}file1.txt
(06) : delete-file {path1/}file2.txt
(07) : delete-file {path1/}file3.txt
(08) : delete-file {path1/}file4.txt
(09) : delete-file {path1/}file5.txt
(10) : test sync should fail due to too many local deletes
(11) : bisync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File was deleted - file1.txt
INFO : - Path1 File was deleted - file2.txt
INFO : - Path1 File was deleted - file3.txt
INFO : - Path1 File was deleted - file4.txt
INFO : - Path1 File was deleted - file5.txt
INFO : Path1: 5 changes: 0 new, 0 newer, 0 older, 5 deleted
INFO : Path2 checking for diffs
ERROR : Safety abort: too many deletes (>50%, 5 of 9) on Path1 "{path1/}". Run with --force if desired.
NOTICE: Bisync aborted. Please try again.
Bisync error: too many deletes
(12) : copy-listings initial-fail
(13) : test change max-delete limit to 60%. sync should run.
(14) : bisync max-delete=60
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File was deleted - file1.txt
INFO : - Path1 File was deleted - file2.txt
INFO : - Path1 File was deleted - file3.txt
INFO : - Path1 File was deleted - file4.txt
INFO : - Path1 File was deleted - file5.txt
INFO : Path1: 5 changes: 0 new, 0 newer, 0 older, 5 deleted
INFO : Path2 checking for diffs
INFO : Applying changes
INFO : - Path2 Queue delete - {path2/}file1.txt
INFO : - Path2 Queue delete - {path2/}file2.txt
INFO : - Path2 Queue delete - {path2/}file3.txt
INFO : - Path2 Queue delete - {path2/}file4.txt
INFO : - Path2 Queue delete - {path2/}file5.txt
INFO : - Path1 Do queued copies to - Path2
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(02) : test initial bisync
(03) : bisync resync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : Resynching Path1 to Path2
INFO : Resync updating listings
INFO : Bisync successful
(04) : test delete >50% of local files
(05) : delete-file {path1/}file1.txt
(06) : delete-file {path1/}file2.txt
(07) : delete-file {path1/}file3.txt
(08) : delete-file {path1/}file4.txt
(09) : delete-file {path1/}file5.txt
(10) : test sync should fail due to too many local deletes
(11) : bisync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File was deleted - file1.txt
INFO : - Path1 File was deleted - file2.txt
INFO : - Path1 File was deleted - file3.txt
INFO : - Path1 File was deleted - file4.txt
INFO : - Path1 File was deleted - file5.txt
INFO : Path1: 5 changes: 0 new, 0 newer, 0 older, 5 deleted
INFO : Path2 checking for diffs
ERROR : Safety abort: too many deletes (>50%, 5 of 9) on Path1 "{path1/}". Run with --force if desired.
NOTICE: Bisync aborted. Please try again.
Bisync error: too many deletes
(12) : copy-listings initial-fail
(13) : test change max-delete limit to 60%. sync should run.
(14) : bisync max-delete=60
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File was deleted - file1.txt
INFO : - Path1 File was deleted - file2.txt
INFO : - Path1 File was deleted - file3.txt
INFO : - Path1 File was deleted - file4.txt
INFO : - Path1 File was deleted - file5.txt
INFO : Path1: 5 changes: 0 new, 0 newer, 0 older, 5 deleted
INFO : Path2 checking for diffs
INFO : Applying changes
INFO : - Path2 Queue delete - {path2/}file1.txt
INFO : - Path2 Queue delete - {path2/}file2.txt
INFO : - Path2 Queue delete - {path2/}file3.txt
INFO : - Path2 Queue delete - {path2/}file4.txt
INFO : - Path2 Queue delete - {path2/}file5.txt
INFO : - Path1 Do queued copies to - Path2
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful