From 729e009485472aced0e677d80a7647d4a9b5899c Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Wed, 24 Jul 2024 19:40:53 +0200 Subject: [PATCH] replace all uses of target in relation to backup --- CHANGELOG.md | 6 +++--- changelog/0.12.0_2021-02-14/issue-3232 | 4 ++-- changelog/0.16.0_2023-07-31/issue-3941 | 2 +- doc/040_backup.rst | 2 +- internal/archiver/archiver.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7ab57158..670f1a40e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -603,7 +603,7 @@ restic users. The changes are ordered by importance. * Enhancement #3941: Support `--group-by` for backup parent selection Previously, the `backup` command by default selected the parent snapshot based on the - hostname and the backup targets. When the backup path list changed, the `backup` command was + hostname and the backup paths. When the backup path list changed, the `backup` command was unable to determine a suitable parent snapshot and had to read all files again. The new `--group-by` option for the `backup` command allows filtering snapshots for the @@ -2575,10 +2575,10 @@ restic users. The changes are ordered by importance. https://github.com/restic/restic/issues/3166 https://github.com/restic/restic/pull/3207 - * Bugfix #3232: Correct statistics for overlapping targets + * Bugfix #3232: Correct statistics for overlapping backup sources A user reported that restic's statistics and progress information during backup was not - correctly calculated when the backup targets (files/dirs to save) overlap. For example, + correctly calculated when the backup sources (files/dirs to save) overlap. For example, consider a directory `foo` which contains (among others) a file `foo/bar`. When `restic backup foo foo/bar` was run, restic counted the size of the file `foo/bar` twice, so the completeness percentage as well as the number of files was wrong. This is now corrected. diff --git a/changelog/0.12.0_2021-02-14/issue-3232 b/changelog/0.12.0_2021-02-14/issue-3232 index 7d9f5c3b7..30b9ee293 100644 --- a/changelog/0.12.0_2021-02-14/issue-3232 +++ b/changelog/0.12.0_2021-02-14/issue-3232 @@ -1,7 +1,7 @@ -Bugfix: Correct statistics for overlapping targets +Bugfix: Correct statistics for overlapping backup sources A user reported that restic's statistics and progress information during backup -was not correctly calculated when the backup targets (files/dirs to save) +was not correctly calculated when the backup sources (files/dirs to save) overlap. For example, consider a directory `foo` which contains (among others) a file `foo/bar`. When `restic backup foo foo/bar` was run, restic counted the size of the file `foo/bar` twice, so the completeness percentage as well as the diff --git a/changelog/0.16.0_2023-07-31/issue-3941 b/changelog/0.16.0_2023-07-31/issue-3941 index ff56d52cc..f1f02db93 100644 --- a/changelog/0.16.0_2023-07-31/issue-3941 +++ b/changelog/0.16.0_2023-07-31/issue-3941 @@ -1,7 +1,7 @@ Enhancement: Support `--group-by` for backup parent selection Previously, the `backup` command by default selected the parent snapshot based -on the hostname and the backup targets. When the backup path list changed, the +on the hostname and the backup paths. When the backup path list changed, the `backup` command was unable to determine a suitable parent snapshot and had to read all files again. diff --git a/doc/040_backup.rst b/doc/040_backup.rst index 39a24ed59..81d99e071 100644 --- a/doc/040_backup.rst +++ b/doc/040_backup.rst @@ -239,7 +239,7 @@ By default, restic always creates a new snapshot even if nothing has changed compared to the parent snapshot. To omit the creation of a new snapshot in this case, specify the ``--skip-if-unchanged`` option. -Note that when using absolute paths to specify the backup target, then also +Note that when using absolute paths to specify the backup source, then also changes to the parent folders result in a changed snapshot. For example, a backup of ``/home/user/work`` will create a new snapshot if the metadata of either ``/``, ``/home`` or ``/home/user`` change. To avoid this problem run restic from diff --git a/internal/archiver/archiver.go b/internal/archiver/archiver.go index 19ad12ab8..d9f089e81 100644 --- a/internal/archiver/archiver.go +++ b/internal/archiver/archiver.go @@ -634,7 +634,7 @@ func (arch *Archiver) saveTree(ctx context.Context, snPath string, atree *Tree, } debug.Log("%v, dir node data loaded from %v", snPath, atree.FileInfoPath) - // in some cases reading xattrs for directories above the backup target is not allowed + // in some cases reading xattrs for directories above the backup source is not allowed // thus ignore errors for such folders. node, err = arch.nodeFromFileInfo(snPath, atree.FileInfoPath, fi, true) if err != nil {