From fe746fa5948f948bb963830298d5f86b5e53ea12 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 5 Nov 2017 20:06:23 +0100 Subject: [PATCH 1/3] clarify same-filesystem requirement for borg upgrade, fixes #2083 --- src/borg/archiver.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 1df9326db..369ab51c7 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -3292,13 +3292,13 @@ def define_archive_filters_group(subparser, *, sort_by=True, first_last=True): borg delete borg - Unless ``--inplace`` is specified, the upgrade process first - creates a backup copy of the repository, in - REPOSITORY.before-upgrade-DATETIME, using hardlinks. This takes - longer than in place upgrades, but is much safer and gives - progress information (as opposed to ``cp -al``). Once you are - satisfied with the conversion, you can safely destroy the - backup copy. + Unless ``--inplace`` is specified, the upgrade process first creates a backup + copy of the repository, in REPOSITORY.before-upgrade-DATETIME, using hardlinks. + This requires that the repository and its parent directory reside on same + filesystem so the hardlink copy can work. + This takes longer than in place upgrades, but is much safer and gives + progress information (as opposed to ``cp -al``). Once you are satisfied + with the conversion, you can safely destroy the backup copy. WARNING: Running the upgrade in place will make the current copy unusable with older version, with no way of going back From 7ddf7c451fc9d13a31f244283778b9d30d2dc12e Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 5 Nov 2017 20:48:49 +0100 Subject: [PATCH 2/3] docs: borg does not respect nodump flag by default any more --- src/borg/archiver.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 369ab51c7..350ceae3b 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -2686,9 +2686,6 @@ def define_archive_filters_group(subparser, *, sort_by=True, first_last=True): and not include any other contents of the containing folder, this can be enabled through using the ``--keep-exclude-tags`` option. - Borg respects the nodump flag. Files flagged nodump will be marked as excluded (x) - in ``--list`` output. - Item flags ++++++++++ From e7fd1ff2ee141731ceb9cee8c29c24f8f4c836ab Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 5 Nov 2017 21:35:58 +0100 Subject: [PATCH 3/3] docs: more than 23 is not supported for CHUNK_MAX_EXP, fixes #3115 --- docs/misc/create_chunker-params.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/misc/create_chunker-params.txt b/docs/misc/create_chunker-params.txt index 3e322b660..af602c5c5 100644 --- a/docs/misc/create_chunker-params.txt +++ b/docs/misc/create_chunker-params.txt @@ -7,6 +7,7 @@ CHUNK_MIN_EXP and CHUNK_MAX_EXP give the exponent N of the 2^N minimum and maximum chunk size. Required: CHUNK_MIN_EXP < CHUNK_MAX_EXP. Defaults: 19 (2^19 == 512KiB) minimum, 23 (2^23 == 8MiB) maximum. +Currently it is not supported to give more than 23 as maximum. HASH_MASK_BITS is the number of least-significant bits of the rolling hash that need to be zero to trigger a chunk cut.