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 DA39261FF0 for ; Fri, 23 Oct 2020 16:32:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D4DCD28FB5 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 0F38528F9B 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 CF15845EF6 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:32 +0200 Message-Id: <20201023143233.14949-3-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.465 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. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/3] backup/datastore: save garbage collection status to disk 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:32:35 -0000 and load it again when opening it this way we can persist the status of the last garbage collect across daemon reloads and reboots Signed-off-by: Dominik Csapak --- src/backup/datastore.rs | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index 2389cc6c..485a10ff 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -9,7 +9,7 @@ use std::fs::File; use anyhow::{bail, format_err, Error}; use lazy_static::lazy_static; -use proxmox::tools::fs::{replace_file, CreateOptions, open_file_locked}; +use proxmox::tools::fs::{replace_file, file_read_optional_string, CreateOptions, open_file_locked}; use super::backup_info::{BackupGroup, BackupDir}; use super::chunk_store::ChunkStore; @@ -71,7 +71,20 @@ impl DataStore { fn open_with_path(store_name: &str, path: &Path, config: DataStoreConfig) -> Result { let chunk_store = ChunkStore::open(store_name, path)?; - let gc_status = GarbageCollectionStatus::default(); + let mut gc_status_path = chunk_store.base_path(); + gc_status_path.push(".gc-status"); + + let gc_status = if let Some(state) = file_read_optional_string(gc_status_path)? { + match serde_json::from_str(&state) { + Ok(state) => state, + Err(err) => { + eprintln!("error reading gc-status: {}", err); + GarbageCollectionStatus::default() + } + } + } else { + GarbageCollectionStatus::default() + }; Ok(Self { chunk_store: Arc::new(chunk_store), @@ -572,6 +585,23 @@ impl DataStore { crate::task_log!(worker, "Average chunk size: {}", HumanByte::from(avg_chunk)); } + if let Ok(serialized) = serde_json::to_string(&gc_status) { + let mut path = self.base_path(); + path.push(".gc-status"); + + let backup_user = crate::backup::backup_user()?; + let mode = nix::sys::stat::Mode::from_bits_truncate(0o0644); + // set the correct owner/group/permissions while saving file + // owner(rw) = backup, group(r)= backup + let options = CreateOptions::new() + .perm(mode) + .owner(backup_user.uid) + .group(backup_user.gid); + + // ignore errors + let _ = replace_file(path, serialized.as_bytes(), options); + } + *self.last_gc_status.lock().unwrap() = gc_status; } else { -- 2.20.1