github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-12-12 12:19:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
810644e873
rclone/cmd/bisync/testdata/test_volatile/golden/test.log
nielash 810644e873 bisync: add --resync-mode for customizing --resync - fixes #5681 
Before this change, the path1 version of a file always prevailed during
--resync, and many users requested options to automatically select the winner
based on characteristics such as newer, older, larger, and smaller. This change
adds support for such options.

Note that ideally this feature would have been implemented by allowing the
existing `--resync` flag to optionally accept string values such as `--resync
newer`. However, this would have been a breaking change, as the existing flag
is a `bool` and it does not seem to be possible to have a `string` flag that
accepts both `--resync newer` and `--resync` (with no argument.) (`NoOptDefVal`
does not work for this, as it would force an `=` like `--resync=newer`.) So
instead, the best compromise to avoid a breaking change was to add a new
`--resync-mode CHOICE` flag that implies `--resync`, while maintaining the
existing behavior of `--resync` (which implies `--resync-mode path1`. i.e. both
flags are now valid, and either can be used without the other.

--resync-mode CHOICE

In the event that a file differs on both sides during a `--resync`,
`--resync-mode` controls which version will overwrite the other. The supported
options are similar to `--conflict-resolve`. For all of the following options,
the version that is kept is referred to as the "winner", and the version that
is overwritten (deleted) is referred to as the "loser". The options are named
after the "winner":

- `path1` - (the default) - the version from Path1 is unconditionally
considered the winner (regardless of `modtime` and `size`, if any). This can be
useful if one side is more trusted or up-to-date than the other, at the time of
the `--resync`.
- `path2` - same as `path1`, except the path2 version is considered the winner.
- `newer` - the newer file (by `modtime`) is considered the winner, regardless
of which side it came from. This may result in having a mix of some winners
from Path1, and some winners from Path2. (The implementation is analagous to
running `rclone copy --update` in both directions.)
- `older` - same as `newer`, except the older file is considered the winner,
and the newer file is considered the loser.
- `larger` - the larger file (by `size`) is considered the winner (regardless
of `modtime`, if any). This can be a useful option for remotes without
`modtime` support, or with the kinds of files (such as logs) that tend to grow
but not shrink, over time.
- `smaller` - the smaller file (by `size`) is considered the winner (regardless
of `modtime`, if any).

For all of the above options, note the following:
- If either of the underlying remotes lacks support for the chosen method, it
will be ignored and will fall back to the default of `path1`. (For example, if
`--resync-mode newer` is set, but one of the paths uses a remote that doesn't
support `modtime`.)
- If a winner can't be determined because the chosen method's attribute is
missing or equal, it will be ignored, and bisync will instead try to determine
whether the files differ by looking at the other `--compare` methods in effect.
(For example, if `--resync-mode newer` is set, but the Path1 and Path2 modtimes
are identical, bisync will compare the sizes.) If bisync concludes that they
differ, preference is given to whichever is the "source" at that moment. (In
practice, this gives a slight advantage to Path2, as the 2to1 copy comes before
the 1to2 copy.) If the files _do not_ differ, nothing is copied (as both sides
are already correct).
- These options apply only to files that exist on both sides (with the same
name and relative path). Files that exist *only* on one side and not the other
are *always* copied to the other, during `--resync` (this is one of the main
differences between resync and non-resync runs.).
- `--conflict-resolve`, `--conflict-loser`, and `--conflict-suffix` do not
apply during `--resync`, and unlike these flags, nothing is renamed during
`--resync`. When a file differs on both sides during `--resync`, one version
always overwrites the other (much like in `rclone copy`.) (Consider using
`--backup-dir` to retain a backup of the losing version.)
- Unlike for `--conflict-resolve`, `--resync-mode none` is not a valid option
(or rather, it will be interpreted as "no resync", unless `--resync` has also
been specified, in which case it will be ignored.)
- Winners and losers are decided at the individual file-level only (there is
not currently an option to pick an entire winning directory atomically,
although the `path1` and `path2` options typically produce a similar result.)
- To maintain backward-compatibility, the `--resync` flag implies
`--resync-mode path1` unless a different `--resync-mode` is explicitly
specified. Similarly, all `--resync-mode` options (except `none`) imply
`--resync`, so it is not necessary to use both the `--resync` and
`--resync-mode` flags simultaneously -- either one is sufficient without the
other.
2024-01-20 17:17:01 -05:00

28 KiB
Raw Blame History

(01) : test volatile
 
(02) : test initial bisync
(03) : 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 Path2 files to Path1
INFO : - Path2 Resync is copying files to - Path1
INFO : - Path1 Resync is copying files to - Path2
INFO : Resync updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
 
(04) : test changed on both paths - file5 (file5R, file5L)
(05) : touch-glob 2001-01-02 {datadir/} file5R.txt
(06) : touch-glob 2023-08-26 {datadir/} file7.txt
(07) : copy-as {datadir/}file5R.txt {path2/} file5.txt
(08) : touch-glob 2001-03-04 {datadir/} file5L.txt
(09) : copy-as {datadir/}file5L.txt {path1/} file5.txt
 
(10) : test bisync with 50 files created during - should ignore new files
(11) : test-func
(12) : 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 : - Path1 File changed: size (larger), time (newer) - file5.txt
INFO : Path1: 1 changes: 0 new, 1 modified, 0 deleted
INFO : (Modified: 1 newer, 0 older, 1 larger, 0 smaller)
INFO : Path2 checking for diffs
INFO : - Path2 File changed: size (larger), time (newer) - file5.txt
INFO : Path2: 1 changes: 0 new, 1 modified, 0 deleted
INFO : (Modified: 1 newer, 0 older, 1 larger, 0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
NOTICE: - WARNING New or changed in both paths - file5.txt
NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt.conflict1
NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt.conflict1
NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt.conflict2
NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt.conflict2
INFO : - Path2 Do queued copies to - Path1
INFO : - Path1 Do queued copies to - Path2
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
 
(13) : test changed on both paths - file5 (file5R, file5L)
(14) : touch-glob 2001-01-02 {datadir/} file5R.txt
(15) : copy-as {datadir/}file5R.txt {path2/} file5.txt
(16) : touch-glob 2001-03-04 {datadir/} file5L.txt
(17) : copy-as {datadir/}file5L.txt {path1/} file5.txt
 
(18) : test next bisync - should now notice new files
(19) : test-func
(20) : 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 : - Path1 File is new - file100.txt
INFO : - Path1 File is new - file5.txt
INFO : - Path1 File is new - file51.txt
INFO : - Path1 File is new - file52.txt
INFO : - Path1 File is new - file53.txt
INFO : - Path1 File is new - file54.txt
INFO : - Path1 File is new - file55.txt
INFO : - Path1 File is new - file56.txt
INFO : - Path1 File is new - file57.txt
INFO : - Path1 File is new - file58.txt
INFO : - Path1 File is new - file59.txt
INFO : - Path1 File is new - file60.txt
INFO : - Path1 File is new - file61.txt
INFO : - Path1 File is new - file62.txt
INFO : - Path1 File is new - file63.txt
INFO : - Path1 File is new - file64.txt
INFO : - Path1 File is new - file65.txt
INFO : - Path1 File is new - file66.txt
INFO : - Path1 File is new - file67.txt
INFO : - Path1 File is new - file68.txt
INFO : - Path1 File is new - file69.txt
INFO : - Path1 File is new - file70.txt
INFO : - Path1 File is new - file71.txt
INFO : - Path1 File is new - file72.txt
INFO : - Path1 File is new - file73.txt
INFO : - Path1 File is new - file74.txt
INFO : - Path1 File is new - file75.txt
INFO : - Path1 File is new - file76.txt
INFO : - Path1 File is new - file77.txt
INFO : - Path1 File is new - file78.txt
INFO : - Path1 File is new - file79.txt
INFO : - Path1 File is new - file80.txt
INFO : - Path1 File is new - file81.txt
INFO : - Path1 File is new - file82.txt
INFO : - Path1 File is new - file83.txt
INFO : - Path1 File is new - file84.txt
INFO : - Path1 File is new - file85.txt
INFO : - Path1 File is new - file86.txt
INFO : - Path1 File is new - file87.txt
INFO : - Path1 File is new - file88.txt
INFO : - Path1 File is new - file89.txt
INFO : - Path1 File is new - file90.txt
INFO : - Path1 File is new - file91.txt
INFO : - Path1 File is new - file92.txt
INFO : - Path1 File is new - file93.txt
INFO : - Path1 File is new - file94.txt
INFO : - Path1 File is new - file95.txt
INFO : - Path1 File is new - file96.txt
INFO : - Path1 File is new - file97.txt
INFO : - Path1 File is new - file98.txt
INFO : - Path1 File is new - file99.txt
INFO : Path1: 51 changes: 51 new, 0 modified, 0 deleted
INFO : Path2 checking for diffs
INFO : - Path2 File changed: size (larger), time (newer) - file1.txt
INFO : - Path2 File changed: size (larger), time (newer) - file2.txt
INFO : - Path2 File changed: size (larger), time (newer) - file3.txt
INFO : - Path2 File changed: size (larger), time (newer) - file4.txt
INFO : - Path2 File changed: size (larger), time (newer) - file6.txt
INFO : - Path2 File changed: size (larger), time (newer) - file7.txt
INFO : - Path2 File changed: size (larger), time (newer) - file8.txt
INFO : - Path2 File is new - file0.txt
INFO : - Path2 File is new - file10.txt
INFO : - Path2 File is new - file11.txt
INFO : - Path2 File is new - file12.txt
INFO : - Path2 File is new - file13.txt
INFO : - Path2 File is new - file14.txt
INFO : - Path2 File is new - file15.txt
INFO : - Path2 File is new - file16.txt
INFO : - Path2 File is new - file17.txt
INFO : - Path2 File is new - file18.txt
INFO : - Path2 File is new - file19.txt
INFO : - Path2 File is new - file20.txt
INFO : - Path2 File is new - file21.txt
INFO : - Path2 File is new - file22.txt
INFO : - Path2 File is new - file23.txt
INFO : - Path2 File is new - file24.txt
INFO : - Path2 File is new - file25.txt
INFO : - Path2 File is new - file26.txt
INFO : - Path2 File is new - file27.txt
INFO : - Path2 File is new - file28.txt
INFO : - Path2 File is new - file29.txt
INFO : - Path2 File is new - file30.txt
INFO : - Path2 File is new - file31.txt
INFO : - Path2 File is new - file32.txt
INFO : - Path2 File is new - file33.txt
INFO : - Path2 File is new - file34.txt
INFO : - Path2 File is new - file35.txt
INFO : - Path2 File is new - file36.txt
INFO : - Path2 File is new - file37.txt
INFO : - Path2 File is new - file38.txt
INFO : - Path2 File is new - file39.txt
INFO : - Path2 File is new - file40.txt
INFO : - Path2 File is new - file41.txt
INFO : - Path2 File is new - file42.txt
INFO : - Path2 File is new - file43.txt
INFO : - Path2 File is new - file44.txt
INFO : - Path2 File is new - file45.txt
INFO : - Path2 File is new - file46.txt
INFO : - Path2 File is new - file47.txt
INFO : - Path2 File is new - file48.txt
INFO : - Path2 File is new - file49.txt
INFO : - Path2 File is new - file5.txt
INFO : - Path2 File is new - file9.txt
INFO : Path2: 50 changes: 43 new, 7 modified, 0 deleted
INFO : (Modified: 7 newer, 0 older, 7 larger, 0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
INFO : - Path1 Queue copy to Path2 - {path2/}file100.txt
NOTICE: - WARNING New or changed in both paths - file5.txt
NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt.conflict3
NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt.conflict3
NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt.conflict4
NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt.conflict4
INFO : - Path1 Queue copy to Path2 - {path2/}file51.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file52.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file53.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file54.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file55.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file56.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file57.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file58.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file59.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file60.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file61.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file62.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file63.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file64.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file65.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file66.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file67.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file68.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file69.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file70.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file71.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file72.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file73.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file74.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file75.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file76.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file77.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file78.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file79.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file80.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file81.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file82.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file83.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file84.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file85.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file86.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file87.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file88.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file89.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file90.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file91.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file92.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file93.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file94.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file95.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file96.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file97.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file98.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file99.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file0.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file11.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file12.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file13.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file14.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file15.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file16.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file17.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file18.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file19.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file20.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file21.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file22.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file23.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file24.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file25.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file26.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file27.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file28.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file29.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file3.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file30.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file31.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file32.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file33.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file34.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file35.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file36.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file37.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file38.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file39.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file4.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file40.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file41.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file42.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file43.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file44.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file45.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file46.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file47.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file48.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file49.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file7.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file8.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file9.txt
INFO : - Path2 Do queued copies to - Path1
INFO : - Path1 Do queued copies to - Path2
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
 
(21) : test changed on both paths - file5 (file5R, file5L)
(22) : touch-glob 2001-01-02 {datadir/} file5R.txt
(23) : copy-as {datadir/}file5R.txt {path2/} file5.txt
(24) : touch-glob 2001-03-04 {datadir/} file5L.txt
(25) : copy-as {datadir/}file5L.txt {path1/} file5.txt
 
(26) : test next bisync - should be no changes except dummy
(27) : test-func
(28) : 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 : - Path1 File is new - file5.txt
INFO : Path1: 1 changes: 1 new, 0 modified, 0 deleted
INFO : Path2 checking for diffs
INFO : - Path2 File is new - file5.txt
INFO : Path2: 1 changes: 1 new, 0 modified, 0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
NOTICE: - WARNING New or changed in both paths - file5.txt
NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt.conflict5
NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt.conflict5
NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt.conflict6
NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt.conflict6
INFO : - Path2 Do queued copies to - Path1
INFO : - Path1 Do queued copies to - Path2
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful