From 4f9e30e980adc57d4825c7bad93a509f92ade653 Mon Sep 17 00:00:00 2001 From: James Buren Date: Fri, 18 Jun 2021 12:58:44 -0500 Subject: [PATCH] resolve clarify borg check --verify-data (#5808) --- docs/usage/check.rst.inc | 4 ++++ src/borg/archiver.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/usage/check.rst.inc b/docs/usage/check.rst.inc index 1cb27c862a..e4e530a2e2 100644 --- a/docs/usage/check.rst.inc +++ b/docs/usage/check.rst.inc @@ -125,6 +125,10 @@ Second, the consistency and correctness of the archive metadata is verified: - In repair mode, when all the archives were checked, orphaned chunks are deleted from the repo. One cause of orphaned chunks are input file related errors (like read errors) in the archive creation process. +- In verify-data mode, a complete cryptographic verification of the archive data + integrity is performed. This conflicts with ``--repository-only`` as this mode + only makes sense if the archive checks are enabled. The full details of this mode + are documented below. - If checking a remote repo via ``ssh:``, the archive check is executed on the client machine because it requires decryption, and this is always done client-side as key access is needed. diff --git a/src/borg/archiver.py b/src/borg/archiver.py index edd795894d..218d586a5a 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -3072,6 +3072,10 @@ def define_borg_mount(parser): - In repair mode, when all the archives were checked, orphaned chunks are deleted from the repo. One cause of orphaned chunks are input file related errors (like read errors) in the archive creation process. + - In verify-data mode, a complete cryptographic verification of the archive data + integrity is performed. This conflicts with ``--repository-only`` as this mode + only makes sense if the archive checks are enabled. The full details of this mode + are documented below. - If checking a remote repo via ``ssh:``, the archive check is executed on the client machine because it requires decryption, and this is always done client-side as key access is needed.