From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v15 01/26] pbs-api-types: add backing-device to DataStoreConfig
Date: Mon, 25 Nov 2024 17:21:48 +0100 [thread overview]
Message-ID: <20241125162213.157011-2-h.laimer@proxmox.com> (raw)
In-Reply-To: <20241125162213.157011-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
pbs-api-types/src/datastore.rs | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index 711051d05..8827604c3 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -45,7 +45,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();
@@ -163,6 +163,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")]
@@ -237,7 +240,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,
@@ -276,6 +279,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)]
@@ -323,6 +332,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]
@@ -357,12 +371,17 @@ 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_maintenance_mode(&self) -> Option<MaintenanceMode> {
--
2.39.5
_______________________________________________
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-11-25 16:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-25 16:21 [pbs-devel] [PATCH proxmox-backup v15 00/26] add removable datastores Hannes Laimer
2024-11-25 16:21 ` Hannes Laimer [this message]
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 02/26] maintenance: make is_offline more generic Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 03/26] maintenance: add 'Unmount' maintenance type Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 04/26] datastore: add helper for checking if a datastore is mounted Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 05/26] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 06/26] api: removable datastore creation Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 07/26] api: add check for nested datastores on creation Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 08/26] pbs-api-types: add mount_status field to DataStoreListItem Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 09/26] bin: manager: add (un)mount command Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 10/26] add auto-mounting for removable datastores Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 11/26] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-11-25 16:21 ` [pbs-devel] [PATCH proxmox-backup v15 12/26] docs: add removable datastores section Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 13/26] ui: add partition selector form Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 14/26] ui: add removable datastore creation support Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 15/26] ui: add (un)mount button to summary Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 16/26] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 17/26] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 18/26] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 19/26] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 20/26] ui: render 'unmount' maintenance mode correctly Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 21/26] api: node: allow creation of removable datastore through directory endpoint Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 22/26] api: node: include removable datastores in directory list Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 23/26] node: disks: replace BASE_MOUNT_DIR with DATASTORE_MOUNT_DIR Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 24/26] ui: support create removable datastore through directory creation Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 25/26] bin: debug: add inspect device command Hannes Laimer
2024-11-25 16:22 ` [pbs-devel] [PATCH proxmox-backup v15 26/26] api: disks: only return UUID of partitions if it actually is one Hannes Laimer
2024-11-25 20:48 ` [pbs-devel] applied-series: [PATCH proxmox-backup v15 00/26] add removable datastores Thomas Lamprecht
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=20241125162213.157011-2-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox