From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 C20286210A for ; Fri, 23 Oct 2020 16:33:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B957928FB4 for ; Fri, 23 Oct 2020 16:32:35 +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 237CE28FA0 for ; Fri, 23 Oct 2020 16:32:35 +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 D9E8945EF5 for ; Fri, 23 Oct 2020 16:32:34 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 23 Oct 2020 16:32:31 +0200 Message-Id: <20201023143233.14949-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201023143233.14949-1-d.csapak@proxmox.com> References: <20201023143233.14949-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.467 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/3] backup/datastore: count still bad chunks for the status X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2020 14:33:05 -0000 we want to show the user that there are still bad chunks after a garbage collection Signed-off-by: Dominik Csapak --- src/api2/types/mod.rs | 3 +++ src/backup/chunk_store.rs | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs index f97db557..1b9a305f 100644 --- a/src/api2/types/mod.rs +++ b/src/api2/types/mod.rs @@ -587,6 +587,8 @@ pub struct GarbageCollectionStatus { pub pending_chunks: usize, /// Number of chunks marked as .bad by verify that have been removed by GC. pub removed_bad: usize, + /// Number of chunks still marked as .bad after garbage collection. + pub still_bad: usize, } impl Default for GarbageCollectionStatus { @@ -602,6 +604,7 @@ impl Default for GarbageCollectionStatus { pending_bytes: 0, pending_chunks: 0, removed_bad: 0, + still_bad: 0, } } } diff --git a/src/backup/chunk_store.rs b/src/backup/chunk_store.rs index 96c46efb..b7556f8a 100644 --- a/src/backup/chunk_store.rs +++ b/src/backup/chunk_store.rs @@ -354,9 +354,11 @@ impl ChunkStore { }, Err(nix::Error::Sys(nix::errno::Errno::ENOENT)) => { // chunk hasn't been rewritten yet, keep .bad file + status.still_bad += 1; }, Err(err) => { // some other error, warn user and keep .bad file around too + status.still_bad += 1; crate::task_warn!( worker, "error during stat on '{:?}' - {}", -- 2.20.1