From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id D3C891FF16F
for <inbox@lore.proxmox.com>; Tue, 15 Apr 2025 12:20:09 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 7C7A945FA;
Tue, 15 Apr 2025 12:20:08 +0200 (CEST)
Date: Tue, 15 Apr 2025 12:19:31 +0200
From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>
References: <20250414092434.147075-1-c.ebner@proxmox.com>
In-Reply-To: <20250414092434.147075-1-c.ebner@proxmox.com>
MIME-Version: 1.0
User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid)
Message-Id: <1744712329.64ywdyp22z.astroid@yuna.none>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.046 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
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. [datastore.rs, proxmox.com]
Subject: [pbs-devel] applied: [PATCH proxmox-backup] garbage collection:
fix: account for created/deleted index files
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>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
thanks!
On April 14, 2025 11:24 am, Christian Ebner wrote:
> Since commit 74361da8 ("garbage collection: generate index file list
> via datastore iterators") not only snapshots present at the start of
> the garbage collection run are considered for marking, but also newly
> added ones. Take these into account by adapting the total index file
> counter used for the progress output.
>
> Further, correctly take into account also index files which have been
> pruned during GC, therefore present in the list of still to process
> index files but never encountered by the datastore iterators. These
> would otherwise be interpreted incorrectly as strange paths and logged
> accordingly, causing confusion as reported in the community forum [0].
>
> Fixes: https://forum.proxmox.com/threads/164968/
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> pbs-datastore/src/datastore.rs | 26 ++++++++++++++++++--------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
> index fbd9eddba..aa38e2ac1 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -1129,7 +1129,7 @@ impl DataStore {
> // the detected index files not following the iterators logic.
>
> let mut unprocessed_index_list = self.list_index_files()?;
> - let index_count = unprocessed_index_list.len();
> + let mut index_count = unprocessed_index_list.len();
>
> let mut chunk_lru_cache = LruCache::new(cache_capacity);
> let mut processed_index_files = 0;
> @@ -1156,7 +1156,10 @@ impl DataStore {
>
> let index = match self.open_index_reader(&path)? {
> Some(index) => index,
> - None => continue,
> + None => {
> + unprocessed_index_list.remove(&path);
> + continue;
> + }
> };
> self.index_mark_used_chunks(
> index,
> @@ -1166,7 +1169,10 @@ impl DataStore {
> worker,
> )?;
>
> - unprocessed_index_list.remove(&path);
> + if !unprocessed_index_list.remove(&path) {
> + info!("Encountered new index file '{path:?}', increment total index file count");
> + index_count += 1;
> + }
>
> let percentage = (processed_index_files + 1) * 100 / index_count;
> if percentage > last_percentage {
> @@ -1182,18 +1188,22 @@ impl DataStore {
> }
> }
>
> - let strange_paths_count = unprocessed_index_list.len();
> - if strange_paths_count > 0 {
> - warn!("found {strange_paths_count} index files outside of expected directory scheme");
> - }
> + let mut strange_paths_count = unprocessed_index_list.len();
> for path in unprocessed_index_list {
> let index = match self.open_index_reader(&path)? {
> Some(index) => index,
> - None => continue,
> + None => {
> + // do not count vanished (pruned) backup snapshots as strange paths.
> + strange_paths_count -= 1;
> + continue;
> + }
> };
> self.index_mark_used_chunks(index, &path, &mut chunk_lru_cache, status, worker)?;
> warn!("Marked chunks for unexpected index file at '{path:?}'");
> }
> + if strange_paths_count > 0 {
> + warn!("Found {strange_paths_count} index files outside of expected directory scheme");
> + }
>
> Ok(())
> }
> --
> 2.39.5
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>
>
>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel