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 EB03BB3316 for ; Tue, 28 Nov 2023 16:25:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CBDE91A01E for ; Tue, 28 Nov 2023 16:25:34 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Tue, 28 Nov 2023 16:25:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 972A441694 for ; Tue, 28 Nov 2023 16:25:33 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 28 Nov 2023 16:25:19 +0100 Message-Id: <20231128152519.34316-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.051 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [disk.rs, zfs.rs, directory.rs, datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup] api: add dedicated datastore disk schema 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: Tue, 28 Nov 2023 15:25:35 -0000 Introduce a dedicated datastore disk schema for disks, to semantically distinguish between datastore name and datastore disk name. Further, adapt the systemd mount unit description accordingly. Signed-off-by: Christian Ebner --- pbs-api-types/src/datastore.rs | 6 ++++++ src/api2/node/disks/directory.rs | 8 ++++---- src/api2/node/disks/zfs.rs | 4 ++-- src/bin/proxmox_backup_manager/disk.rs | 10 +++++----- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs index 1f619c9d..4150c6c6 100644 --- a/pbs-api-types/src/datastore.rs +++ b/pbs-api-types/src/datastore.rs @@ -102,6 +102,12 @@ pub const DATASTORE_SCHEMA: Schema = StringSchema::new("Datastore name.") .max_length(32) .schema(); +pub const DATASTORE_DISK_SCHEMA: Schema = StringSchema::new("Datastore disk name.") + .format(&PROXMOX_SAFE_ID_FORMAT) + .min_length(3) + .max_length(32) + .schema(); + pub const CHUNK_DIGEST_SCHEMA: Schema = StringSchema::new("Chunk digest (SHA256).") .format(&CHUNK_DIGEST_FORMAT) .schema(); diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs index 5e1cb124..c43eb125 100644 --- a/src/api2/node/disks/directory.rs +++ b/src/api2/node/disks/directory.rs @@ -8,7 +8,7 @@ use proxmox_section_config::SectionConfigData; use proxmox_sys::task_log; use pbs_api_types::{ - DataStoreConfig, BLOCKDEVICE_NAME_SCHEMA, DATASTORE_SCHEMA, NODE_SCHEMA, PRIV_SYS_AUDIT, + DataStoreConfig, BLOCKDEVICE_NAME_SCHEMA, DATASTORE_DISK_SCHEMA, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA, }; @@ -112,7 +112,7 @@ pub fn list_datastore_mounts() -> Result, Error> { schema: NODE_SCHEMA, }, name: { - schema: DATASTORE_SCHEMA, + schema: DATASTORE_DISK_SCHEMA, }, disk: { schema: BLOCKDEVICE_NAME_SCHEMA, @@ -227,7 +227,7 @@ pub fn create_datastore_disk( schema: NODE_SCHEMA, }, name: { - schema: DATASTORE_SCHEMA, + schema: DATASTORE_DISK_SCHEMA, }, } }, @@ -296,7 +296,7 @@ fn create_datastore_mount_unit( let unit = SystemdUnitSection { Description: format!( - "Mount datatstore '{}' under '{}'", + "Mount datastore disk '{}' under '{}'", datastore_name, mount_point ), ..Default::default() diff --git a/src/api2/node/disks/zfs.rs b/src/api2/node/disks/zfs.rs index 673dc1bf..52c011db 100644 --- a/src/api2/node/disks/zfs.rs +++ b/src/api2/node/disks/zfs.rs @@ -6,7 +6,7 @@ use proxmox_schema::api; use proxmox_sys::{task_error, task_log}; use pbs_api_types::{ - DataStoreConfig, ZfsCompressionType, ZfsRaidLevel, ZpoolListItem, DATASTORE_SCHEMA, + DataStoreConfig, ZfsCompressionType, ZfsRaidLevel, ZpoolListItem, DATASTORE_DISK_SCHEMA, DISK_ARRAY_SCHEMA, DISK_LIST_SCHEMA, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA, ZFS_ASHIFT_SCHEMA, ZPOOL_NAME_SCHEMA, }; @@ -117,7 +117,7 @@ pub fn zpool_details(name: String) -> Result { schema: NODE_SCHEMA, }, name: { - schema: DATASTORE_SCHEMA, + schema: DATASTORE_DISK_SCHEMA, }, devices: { schema: DISK_LIST_SCHEMA, diff --git a/src/bin/proxmox_backup_manager/disk.rs b/src/bin/proxmox_backup_manager/disk.rs index fae8829f..4c040c4a 100644 --- a/src/bin/proxmox_backup_manager/disk.rs +++ b/src/bin/proxmox_backup_manager/disk.rs @@ -5,8 +5,8 @@ use proxmox_router::{cli::*, ApiHandler, RpcEnvironment}; use proxmox_schema::api; use pbs_api_types::{ - ZfsCompressionType, ZfsRaidLevel, BLOCKDEVICE_NAME_SCHEMA, DATASTORE_SCHEMA, DISK_LIST_SCHEMA, - ZFS_ASHIFT_SCHEMA, + ZfsCompressionType, ZfsRaidLevel, BLOCKDEVICE_NAME_SCHEMA, DATASTORE_DISK_SCHEMA, + DISK_LIST_SCHEMA, ZFS_ASHIFT_SCHEMA, }; use proxmox_backup::tools::disks::{complete_disk_name, FileSystemType, SmartAttribute}; @@ -141,7 +141,7 @@ async fn initialize_disk( input: { properties: { name: { - schema: DATASTORE_SCHEMA, + schema: DATASTORE_DISK_SCHEMA, }, devices: { schema: DISK_LIST_SCHEMA, @@ -282,7 +282,7 @@ fn list_datastore_mounts( input: { properties: { name: { - schema: DATASTORE_SCHEMA, + schema: DATASTORE_DISK_SCHEMA, }, disk: { schema: BLOCKDEVICE_NAME_SCHEMA, @@ -321,7 +321,7 @@ async fn create_datastore_disk( input: { properties: { name: { - schema: DATASTORE_SCHEMA, + schema: DATASTORE_DISK_SCHEMA, }, }, }, -- 2.39.2