From 2a0bd2b637b4b791f92f3d84c565aaaf39b9ddb2 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Sun, 4 Feb 2024 16:50:50 +0100 Subject: [PATCH] rename `--no-verify-pack` to `--no-extra-verify` --- changelog/unreleased/issue-4529 | 2 +- cmd/restic/global.go | 10 +++++----- internal/repository/repack_test.go | 4 ++-- internal/repository/repository.go | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/changelog/unreleased/issue-4529 b/changelog/unreleased/issue-4529 index 2e8bbbed7..c3ec69510 100644 --- a/changelog/unreleased/issue-4529 +++ b/changelog/unreleased/issue-4529 @@ -8,7 +8,7 @@ To prevent the upload of corrupted data to the repository, restic now additionally verifies that files can be decoded and contain the correct data beforehand. This increases the CPU usage during backups. If absolutely necessary, you can disable the verification using the option -`--no-verify-pack`. +`--no-extra-verify`. https://github.com/restic/restic/issues/4529 https://github.com/restic/restic/pull/4681 diff --git a/cmd/restic/global.go b/cmd/restic/global.go index 5bdf03bdc..8568e41c3 100644 --- a/cmd/restic/global.go +++ b/cmd/restic/global.go @@ -67,7 +67,7 @@ type GlobalOptions struct { CleanupCache bool Compression repository.CompressionMode PackSize uint - NoVerifyPack bool + NoExtraVerify bool backend.TransportOptions limiter.Limits @@ -140,7 +140,7 @@ func init() { f.BoolVar(&globalOptions.InsecureTLS, "insecure-tls", false, "skip TLS certificate verification when connecting to the repository (insecure)") f.BoolVar(&globalOptions.CleanupCache, "cleanup-cache", false, "auto remove old cache directories") f.Var(&globalOptions.Compression, "compression", "compression mode (only available for repository format version 2), one of (auto|off|max) (default: $RESTIC_COMPRESSION)") - f.BoolVar(&globalOptions.NoVerifyPack, "no-verify-pack", false, "skip verification of data before upload") + f.BoolVar(&globalOptions.NoExtraVerify, "no-extra-verify", false, "skip verification of data before upload") f.IntVar(&globalOptions.Limits.UploadKb, "limit-upload", 0, "limits uploads to a maximum `rate` in KiB/s. (default: unlimited)") f.IntVar(&globalOptions.Limits.DownloadKb, "limit-download", 0, "limits downloads to a maximum `rate` in KiB/s. (default: unlimited)") f.UintVar(&globalOptions.PackSize, "pack-size", 0, "set target pack `size` in MiB, created pack files may be larger (default: $RESTIC_PACK_SIZE)") @@ -455,9 +455,9 @@ func OpenRepository(ctx context.Context, opts GlobalOptions) (*repository.Reposi } s, err := repository.New(be, repository.Options{ - Compression: opts.Compression, - PackSize: opts.PackSize * 1024 * 1024, - NoVerifyPack: opts.NoVerifyPack, + Compression: opts.Compression, + PackSize: opts.PackSize * 1024 * 1024, + NoExtraVerify: opts.NoExtraVerify, }) if err != nil { return nil, errors.Fatal(err.Error()) diff --git a/internal/repository/repack_test.go b/internal/repository/repack_test.go index 00567aad9..1ecbf3e1c 100644 --- a/internal/repository/repack_test.go +++ b/internal/repository/repack_test.go @@ -347,7 +347,7 @@ func TestRepackWrongBlob(t *testing.T) { func testRepackWrongBlob(t *testing.T, version uint) { // disable verification to allow adding corrupted blobs to the repository - repo := repository.TestRepositoryWithBackend(t, nil, version, repository.Options{NoVerifyPack: true}) + repo := repository.TestRepositoryWithBackend(t, nil, version, repository.Options{NoExtraVerify: true}) seed := time.Now().UnixNano() rand.Seed(seed) @@ -373,7 +373,7 @@ func TestRepackBlobFallback(t *testing.T) { func testRepackBlobFallback(t *testing.T, version uint) { // disable verification to allow adding corrupted blobs to the repository - repo := repository.TestRepositoryWithBackend(t, nil, version, repository.Options{NoVerifyPack: true}) + repo := repository.TestRepositoryWithBackend(t, nil, version, repository.Options{NoExtraVerify: true}) seed := time.Now().UnixNano() rand.Seed(seed) diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 1e253c24a..cea43b0d3 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -59,9 +59,9 @@ type Repository struct { } type Options struct { - Compression CompressionMode - PackSize uint - NoVerifyPack bool + Compression CompressionMode + PackSize uint + NoExtraVerify bool } // CompressionMode configures if data should be compressed. @@ -444,7 +444,7 @@ func (r *Repository) saveAndEncrypt(ctx context.Context, t restic.BlobType, data } func (r *Repository) verifyCiphertext(buf []byte, uncompressedLength int, id restic.ID) error { - if r.opts.NoVerifyPack { + if r.opts.NoExtraVerify { return nil } @@ -542,7 +542,7 @@ func (r *Repository) SaveUnpacked(ctx context.Context, t restic.FileType, buf [] } func (r *Repository) verifyUnpacked(buf []byte, t restic.FileType, expected []byte) error { - if r.opts.NoVerifyPack { + if r.opts.NoExtraVerify { return nil }