From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v11 03/26] pbs-api-types: add backing-device to DataStoreConfig
Date: Tue, 20 Aug 2024 17:43:37 +0200 [thread overview]
Message-ID: <20240820154400.149863-4-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240820154400.149863-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
pbs-api-types/src/datastore.rs | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index a5704c93..e5c5cfcf 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -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")]
@@ -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<String>,
+
+ /// The UUID of the device(for removable datastores)
+ #[updater(skip)]
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub backing_device: Option<String>,
}
#[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 let Some(mount_point) = self.get_mount_point() {
+ format!("{mount_point}/{}", self.path.trim_matches('/'))
+ } else {
+ self.path.clone()
+ }
+ }
+
+ pub fn get_mount_point(&self) -> Option<String> {
+ self.backing_device
+ .is_some()
+ .then(|| format!("{DATASTORE_MOUNT_DIR}/{}", self.name))
}
pub fn get_maintenance_mode(&self) -> Option<MaintenanceMode> {
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-08-20 15:43 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-20 15:43 [pbs-devel] [PATCH proxmox-backup v11 00/26] add removable datastores Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 01/26] tools: add disks utility functions Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 02/26] config: factor out method to get the absolute datastore path Hannes Laimer
2024-08-20 15:43 ` Hannes Laimer [this message]
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 04/26] maintenance: add 'Unmount' maintenance type Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 05/26] disks: add UUID to partition info Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 06/26] datastore: add helper for checking if a removable datastore is available Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 07/26] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 08/26] api: removable datastore creation Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 09/26] api: disks list: add exclude-used flag Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 10/26] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 11/26] bin: manager: add (un)mount command Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 12/26] add auto-mounting for removable datastores Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 13/26] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 14/26] docs: add removable datastores section Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 15/26] ui: add partition selector form Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 16/26] ui: add removable datastore creation support Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 17/26] ui: add (un)mount button to summary Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 18/26] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 19/26] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 20/26] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 21/26] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 22/26] ui: render 'unmount' maintenance mode correctly Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 23/26] api: node: allow creation of removable datastore through directory endpoint Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 24/26] api: node: include removable datastores in directory list Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 25/26] node: disks: replace BASE_MOUNT_DIR with DATASTORE_MOUNT_DIR Hannes Laimer
2024-08-20 15:44 ` [pbs-devel] [PATCH proxmox-backup v11 26/26] ui: support create removable datastore through directory creation Hannes Laimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240820154400.149863-4-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.