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 A148F1FF187
for <inbox@lore.proxmox.com>; Wed, 7 May 2025 17:38:31 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 7F7E73F8F8;
Wed, 7 May 2025 17:38:47 +0200 (CEST)
From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Wed, 7 May 2025 17:38:33 +0200
Message-Id: <20250507153834.758840-2-c.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250507153834.758840-1-c.ebner@proxmox.com>
References: <20250507153834.758840-1-c.ebner@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.028 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]
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] api: datastore: make group
notes path helper a DataStore method
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>
Move and make the helper function to get a backup groups notes file
path a `DataStore` method instead. This allows it to be reused when
access to the notes path is required from the datastore itself.
Further, use the plural `notes` wording also in the helper to be
consistent with the rest of the codebase.
In preparation for correctly removing the notes file from the backup
group on destruction.
No functional changes intended.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
pbs-datastore/src/datastore.rs | 11 +++++++++++
src/api2/admin/datastore.rs | 26 +++++++-------------------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index cbf78ecb6..91c7e76be 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -40,6 +40,8 @@ use crate::DataBlob;
static DATASTORE_MAP: LazyLock<Mutex<HashMap<String, Arc<DataStoreImpl>>>> =
LazyLock::new(|| Mutex::new(HashMap::new()));
+const GROUP_NOTES_FILE_NAME: &str = "notes";
+
/// checks if auth_id is owner, or, if owner is a token, if
/// auth_id is the user of the token
pub fn check_backup_owner(owner: &Authid, auth_id: &Authid) -> Result<(), Error> {
@@ -524,6 +526,15 @@ impl DataStore {
full_path
}
+ /// Returns the absolute path of a backup groups notes file
+ pub fn group_notes_path(
+ &self,
+ ns: &BackupNamespace,
+ group: &pbs_api_types::BackupGroup,
+ ) -> PathBuf {
+ self.group_path(ns, group).join(GROUP_NOTES_FILE_NAME)
+ }
+
/// Returns the absolute path for backup_dir
pub fn snapshot_path(
&self,
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 392494488..cc7e17a29 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -4,7 +4,7 @@ use std::collections::HashSet;
use std::ffi::OsStr;
use std::ops::Deref;
use std::os::unix::ffi::OsStrExt;
-use std::path::{Path, PathBuf};
+use std::path::Path;
use std::sync::Arc;
use anyhow::{bail, format_err, Context, Error};
@@ -77,18 +77,6 @@ use crate::backup::{
use crate::server::jobstate::{compute_schedule_status, Job, JobState};
-const GROUP_NOTES_FILE_NAME: &str = "notes";
-
-fn get_group_note_path(
- store: &DataStore,
- ns: &BackupNamespace,
- group: &pbs_api_types::BackupGroup,
-) -> PathBuf {
- let mut note_path = store.group_path(ns, group);
- note_path.push(GROUP_NOTES_FILE_NAME);
- note_path
-}
-
// helper to unify common sequence of checks:
// 1. check privs on NS (full or limited access)
// 2. load datastore
@@ -244,8 +232,8 @@ pub fn list_groups(
})
.to_owned();
- let note_path = get_group_note_path(&datastore, &ns, group.as_ref());
- let comment = file_read_firstline(note_path).ok();
+ let notes_path = datastore.group_notes_path(&ns, group.as_ref());
+ let comment = file_read_firstline(notes_path).ok();
group_info.push(GroupListItem {
backup: group.into(),
@@ -2053,8 +2041,8 @@ pub fn get_group_notes(
&backup_group,
)?;
- let note_path = get_group_note_path(&datastore, &ns, &backup_group);
- Ok(file_read_optional_string(note_path)?.unwrap_or_else(|| "".to_owned()))
+ let notes_path = datastore.group_notes_path(&ns, &backup_group);
+ Ok(file_read_optional_string(notes_path)?.unwrap_or_else(|| "".to_owned()))
}
#[api(
@@ -2101,8 +2089,8 @@ pub fn set_group_notes(
&backup_group,
)?;
- let note_path = get_group_note_path(&datastore, &ns, &backup_group);
- replace_file(note_path, notes.as_bytes(), CreateOptions::new(), false)?;
+ let notes_path = datastore.group_notes_path(&ns, &backup_group);
+ replace_file(notes_path, notes.as_bytes(), CreateOptions::new(), false)?;
Ok(())
}
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel