From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v8 04/23] datastore: add helper for checking if a removable datastore is available
Date: Fri, 19 Apr 2024 17:55:47 +0200 [thread overview]
Message-ID: <20240419155606.112010-5-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240419155606.112010-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
pbs-api-types/src/maintenance.rs | 2 +-
pbs-datastore/src/datastore.rs | 44 ++++++++++++++++++++++++++++++++
pbs-datastore/src/lib.rs | 2 +-
3 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/pbs-api-types/src/maintenance.rs b/pbs-api-types/src/maintenance.rs
index fd4d3416..4f653ec7 100644
--- a/pbs-api-types/src/maintenance.rs
+++ b/pbs-api-types/src/maintenance.rs
@@ -81,7 +81,7 @@ impl MaintenanceMode {
/// Used for deciding whether the datastore is cleared from the internal cache after the last
/// task finishes, so all open files are closed.
pub fn is_offline(&self) -> bool {
- self.ty == MaintenanceType::Offline
+ self.ty == MaintenanceType::Offline || self.ty == MaintenanceType::Unmount
}
pub fn check(&self, operation: Option<Operation>) -> Result<(), Error> {
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index f95da761..7d427e13 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -14,6 +14,7 @@ use proxmox_schema::ApiType;
use proxmox_sys::error::SysError;
use proxmox_sys::fs::{file_read_optional_string, replace_file, CreateOptions};
use proxmox_sys::fs::{lock_dir_noblock, DirLockGuard};
+use proxmox_sys::linux::procfs::MountInfo;
use proxmox_sys::process_locker::ProcessLockSharedGuard;
use proxmox_sys::WorkerTaskContext;
use proxmox_sys::{task_log, task_warn};
@@ -49,6 +50,39 @@ pub fn check_backup_owner(owner: &Authid, auth_id: &Authid) -> Result<(), Error>
Ok(())
}
+/// check if a removable datastore is currently available/mounted by using the UUID
+/// to find the `/dev/sdX` path and checking in /proc/self/mountinfo for entries containing it.
+/// If it should mounted, but not in the expected path, so config.path, it is considered not
+/// available.
+pub fn is_datastore_available(config: &DataStoreConfig) -> bool {
+ config.backing_device.as_ref().map_or(true, |uuid| {
+ if let Ok(store_dev_path) = std::fs::read_link(Path::new("/dev/disk/by-uuid").join(uuid))
+ .map(|p| p.to_string_lossy().into_owned())
+ .map(|p| p.replace("../..", "/dev"))
+ .map(PathBuf::from)
+ {
+ let store_mount_point = config.get_mount_point().map(|mp| PathBuf::from(&mp));
+
+ MountInfo::read().map_or(false, |mount_info| {
+ mount_info
+ .iter()
+ .filter_map(|(_, entry)| {
+ entry
+ .mount_source
+ .as_ref()
+ .map(|source| (&entry.mount_point, source))
+ })
+ .any(|(mount_point, mount_source)| {
+ Some(PathBuf::from(&mount_point)) == store_mount_point
+ && PathBuf::from(&mount_source) == store_dev_path
+ })
+ })
+ } else {
+ false
+ }
+ })
+}
+
/// Datastore Management
///
/// A Datastore can store severals backups, and provides the
@@ -158,6 +192,12 @@ impl DataStore {
}
}
+ if config.backing_device.is_some() && !is_datastore_available(&config) {
+ let mut datastore_cache = DATASTORE_MAP.lock().unwrap();
+ datastore_cache.remove(&config.name);
+ bail!("Removable Datastore is not mounted");
+ }
+
if let Some(operation) = operation {
update_active_operations(name, operation, 1)?;
}
@@ -261,6 +301,10 @@ impl DataStore {
) -> Result<Arc<Self>, Error> {
let name = config.name.clone();
+ if !is_datastore_available(&config) {
+ bail!("Datastore is not available")
+ }
+
let tuning: DatastoreTuning = serde_json::from_value(
DatastoreTuning::API_SCHEMA
.parse_property_string(config.tuning.as_deref().unwrap_or(""))?,
diff --git a/pbs-datastore/src/lib.rs b/pbs-datastore/src/lib.rs
index 43050162..458f93d9 100644
--- a/pbs-datastore/src/lib.rs
+++ b/pbs-datastore/src/lib.rs
@@ -206,7 +206,7 @@ pub use manifest::BackupManifest;
pub use store_progress::StoreProgress;
mod datastore;
-pub use datastore::{check_backup_owner, DataStore};
+pub use datastore::{check_backup_owner, is_datastore_available, DataStore};
mod hierarchy;
pub use hierarchy::{
--
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-04-19 15:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 15:55 [pbs-devel] [PATCH proxmox-backup v8 00/23] add removable datastores Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 01/23] tools: add disks utility functions Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 02/23] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-22 7:12 ` Thomas Lamprecht
2024-04-22 9:29 ` Dietmar Maurer
2024-04-22 9:48 ` Dietmar Maurer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 03/23] disks: add UUID to partition info Hannes Laimer
2024-04-19 15:55 ` Hannes Laimer [this message]
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 05/23] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 06/23] api: removable datastore creation Hannes Laimer
2024-04-22 7:28 ` Dietmar Maurer
2024-04-22 7:37 ` Hannes Laimer
2024-04-22 9:05 ` Christian Ebner
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 07/23] api: disks list: add exclude-used flag Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 08/23] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 09/23] bin: manager: add (un)mount command Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 10/23] add auto-mounting for removable datastores Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 11/23] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 12/23] docs: add removable datastores section Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 13/23] ui: add partition selector form Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 14/23] ui: add removable datastore creation support Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 15/23] ui: add (un)mount button to summary Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 16/23] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 17/23] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 18/23] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 19/23] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 20/23] ui: render 'unmount' maintenance mode correctly Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 21/23] api: node: allow creation of removable datastore through directory endpoint Hannes Laimer
2024-04-22 9:27 ` Christian Ebner
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 22/23] api: node: include removable datastores in directory list Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 23/23] 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=20240419155606.112010-5-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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal