From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dcsapak@zita.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 77E876730A
for <pbs-devel@lists.proxmox.com>; Thu, 30 Jul 2020 09:09:06 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 69A5013476
for <pbs-devel@lists.proxmox.com>; Thu, 30 Jul 2020 09:09:06 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id E50B81345D
for <pbs-devel@lists.proxmox.com>; Thu, 30 Jul 2020 09:09:05 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A975C433F7
for <pbs-devel@lists.proxmox.com>; Thu, 30 Jul 2020 09:09:05 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 30 Jul 2020 09:09:03 +0200
Message-Id: <20200730070905.10735-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.046 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
Subject: [pbs-devel] [PATCH proxmox-backup 1/3] verify: check all chunks of
an index, even if we encounter a corrupt one
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 30 Jul 2020 07:09:06 -0000
this makes it easier to see which chunks are corrupt
(and enables us in the future to build a 'complete' list of
corrupt chunks)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/backup/verify.rs | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/backup/verify.rs b/src/backup/verify.rs
index 33aaa621..9e309b12 100644
--- a/src/backup/verify.rs
+++ b/src/backup/verify.rs
@@ -42,6 +42,7 @@ fn verify_index_chunks(
worker: &WorkerTask,
) -> Result<(), Error> {
+ let mut errors = 0;
for pos in 0..index.index_count() {
worker.fail_on_abort()?;
@@ -50,11 +51,19 @@ fn verify_index_chunks(
let size = info.range.end - info.range.start;
if !verified_chunks.contains(&info.digest) {
- datastore.verify_stored_chunk(&info.digest, size)?;
- verified_chunks.insert(info.digest);
+ if let Err(err) = datastore.verify_stored_chunk(&info.digest, size) {
+ worker.log(format!("{}", err));
+ errors += 1;
+ } else {
+ verified_chunks.insert(info.digest);
+ }
}
}
+ if errors > 0 {
+ bail!("chunks could not be verified");
+ }
+
Ok(())
}
--
2.20.1