From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 8A9901FF1AD for ; Wed, 13 Nov 2024 16:01:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1D08018989; Wed, 13 Nov 2024 16:01:40 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 13 Nov 2024 16:00:39 +0100 Message-Id: <20241113150102.164820-4-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113150102.164820-1-h.laimer@proxmox.com> References: <20241113150102.164820-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 Subject: [pbs-devel] [PATCH proxmox-backup v13 03/26] pbs-api-types: add backing-device to DataStoreConfig 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Signed-off-by: Hannes Laimer --- changes since v12: * clearify/improve description of `DATASTORE_DIR_NAME_SCHAME` pbs-api-types/src/datastore.rs | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs index a5704c93..f6c255d3 100644 --- a/pbs-api-types/src/datastore.rs +++ b/pbs-api-types/src/datastore.rs @@ -42,7 +42,7 @@ const_regex! { pub const CHUNK_DIGEST_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SHA256_HEX_REGEX); -pub const DIR_NAME_SCHEMA: Schema = StringSchema::new("Directory name") +pub const DATASTORE_DIR_NAME_SCHEMA: Schema = StringSchema::new("Either the absolute path to the datastore directory, or a relative on-device path for removable datastores.") .min_length(1) .max_length(4096) .schema(); @@ -160,6 +160,9 @@ pub const PRUNE_SCHEMA_KEEP_YEARLY: Schema = .minimum(1) .schema(); +/// Base directory where datastores are mounted +pub const DATASTORE_MOUNT_DIR: &str = "/mnt/datastore"; + #[api] #[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "lowercase")] @@ -234,7 +237,7 @@ pub const DATASTORE_TUNING_STRING_SCHEMA: Schema = StringSchema::new("Datastore schema: DATASTORE_SCHEMA, }, path: { - schema: DIR_NAME_SCHEMA, + schema: DATASTORE_DIR_NAME_SCHEMA, }, "notify-user": { optional: true, @@ -273,6 +276,12 @@ pub const DATASTORE_TUNING_STRING_SCHEMA: Schema = StringSchema::new("Datastore format: &ApiStringFormat::PropertyString(&MaintenanceMode::API_SCHEMA), type: String, }, + "backing-device": { + description: "The UUID of the filesystem partition for removable datastores.", + optional: true, + format: &proxmox_schema::api_types::UUID_FORMAT, + type: String, + } } )] #[derive(Serialize, Deserialize, Updater, Clone, PartialEq)] @@ -320,6 +329,11 @@ pub struct DataStoreConfig { /// Maintenance mode, type is either 'offline' or 'read-only', message should be enclosed in " #[serde(skip_serializing_if = "Option::is_none")] pub maintenance_mode: Option, + + /// The UUID of the device(for removable datastores) + #[updater(skip)] + #[serde(skip_serializing_if = "Option::is_none")] + pub backing_device: Option, } #[api] @@ -354,12 +368,23 @@ impl DataStoreConfig { notification_mode: None, tuning: None, maintenance_mode: None, + backing_device: None, } } /// Returns the absolute path to the datastore content. pub fn absolute_path(&self) -> String { - self.path.clone() + if self.backing_device.is_some() { + format!("{DATASTORE_MOUNT_DIR}/{}", self.name) + } else { + self.path.clone() + } + } + + pub fn get_mount_point(&self) -> Option { + self.backing_device + .is_some() + .then(|| format!("{DATASTORE_MOUNT_DIR}/{}", self.name)) } pub fn get_maintenance_mode(&self) -> Option { -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel