mirror of
https://github.com/rclone/rclone.git
synced 2025-12-24 04:04:37 +00:00
3b49fd24d4
Before this change, there was a bug affecting listing files when: - a given bisync run had changes in the 2to1 direction AND - the run had NO changes in the 1to2 direction AND - at least one of the changed files changed AGAIN during the run (specifically, after the initial march and before the transfers.) In this situation, the listings on one side would still retain the prior version of the changed file, potentially causing conflicts or errors. This change fixes the issue by making sure that if we're updating the listings on one side, we must also update the other. (We previously tried to skip it for efficiency, but this failed to account for the possibility that a changed file could change again during the run.)
74 lines
2.9 KiB
Plaintext
74 lines
2.9 KiB
Plaintext
[36m(01) :[0m [34mtest concurrent[0m
|
||
|
||
[36m(02) :[0m [34mtest initial bisync[0m
|
||
[36m(03) :[0m [34mbisync resync[0m
|
||
INFO : [2mSetting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.[0m
|
||
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 Path2 files to Path1
|
||
INFO : - [34mPath2[0m [35mResync is copying files to[0m - [36mPath1[0m
|
||
INFO : - [36mPath1[0m [35mResync is copying files to[0m - [36mPath2[0m
|
||
INFO : Resync updating listings
|
||
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
|
||
INFO : [32mBisync successful[0m
|
||
|
||
[36m(04) :[0m [34mtest changed on one path - file1[0m
|
||
[36m(05) :[0m [34mtouch-glob 2001-01-02 {datadir/} file5R.txt[0m
|
||
[36m(06) :[0m [34mtouch-glob 2023-08-26 {datadir/} file7.txt[0m
|
||
[36m(07) :[0m [34mcopy-as {datadir/}file5R.txt {path2/} file1.txt[0m
|
||
|
||
[36m(08) :[0m [34mtest bisync with file changed during[0m
|
||
[36m(09) :[0m [34mconcurrent-func[0m
|
||
[36m(10) :[0m [34mbisync[0m
|
||
INFO : [2mSetting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.[0m
|
||
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 : - [34mPath2[0m [35m[33mFile changed: [35msize (larger)[0m, [35mtime (newer)[0m[0m[0m - [36mfile1.txt[0m
|
||
INFO : Path2: 1 changes: [32m 0 new[0m, [33m 1 modified[0m, [31m 0 deleted[0m
|
||
INFO : ([33mModified[0m: [36m 1 newer[0m, [34m 0 older[0m, [36m 1 larger[0m, [34m 0 smaller[0m)
|
||
INFO : Applying changes
|
||
INFO : - [34mPath2[0m [35m[32mQueue copy to[0m Path1[0m - [36m{path1/}file1.txt[0m
|
||
INFO : - [34mPath2[0m [35mDo queued copies to[0m - [36mPath1[0m
|
||
INFO : Updating listings
|
||
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
|
||
INFO : [32mBisync successful[0m
|
||
|
||
[36m(11) :[0m [34mbisync[0m
|
||
INFO : [2mSetting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.[0m
|
||
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 : [32mBisync successful[0m
|