From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Hannes Laimer <h.laimer@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [PATCH proxmox-backup v9 06/26] datastore: add helper for checking if a removable datastore is available
Date: Wed, 24 Apr 2024 15:30:59 +0200 [thread overview]
Message-ID: <652skntahltrhvy7ftnqezkxjb2orfshcqtujfepkksf7e6cyd@cggigo56vaqq> (raw)
In-Reply-To: <20240423083000.28002-7-h.laimer@proxmox.com>
On Tue, Apr 23, 2024 at 10:29:40AM +0200, Hannes Laimer wrote:
> 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 f9b986c1..978ebb70 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"))
^ Merge the two .maps together and you can drop the into_owned()
Also, this is very fragile!
`/proc/self/mountinfo` does NOT necessarily contain the final device
node.
For instance, for LVs you do NOT see `/dev/dm-xy`, but
`/dev/mapper/foo-bar`.
I pushed an alternative to my `staff` repo's
`removable-datastore-review` branch which worked for my testing.
There I instead `stat` the backing device and the source device found in
the MountInfo and compare their `st_rdev` values.
> + .map(PathBuf::from)
^ Not strictly needed
> + {
> + let store_mount_point = config.get_mount_point().map(|mp| PathBuf::from(&mp));
^ The loop below only ever returns true if this is Some, so we can leave
early here if it is not.
> +
> + 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
^Note that you can always use `Path` instead of allocating PathBufs if
all you want to do is comapre stuff.
> + })
> + })
> + } else {
> + false
> + }
> + })
> +}
_______________________________________________
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-24 13:31 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 8:29 [pbs-devel] [PATCH proxmox-backup v9 00/26] add removable datastores Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 01/26] tools: add disks utility functions Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 02/26] config: factor out method to get the absolute datastore path Hannes Laimer
2024-04-24 13:26 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 03/26] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 04/26] maintenance: add 'Unmount' maintenance type Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 05/26] disks: add UUID to partition info Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 06/26] datastore: add helper for checking if a removable datastore is available Hannes Laimer
2024-04-24 11:16 ` Gabriel Goller
2024-04-24 13:30 ` Wolfgang Bumiller [this message]
2024-04-25 6:05 ` Hannes Laimer
2024-04-25 7:19 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 07/26] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 08/26] api: removable datastore creation Hannes Laimer
2024-04-24 13:04 ` Wolfgang Bumiller
2024-04-25 8:52 ` Wolfgang Bumiller
2024-04-25 8:58 ` Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 09/26] api: disks list: add exclude-used flag Hannes Laimer
2024-04-24 13:09 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 10/26] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-24 13:13 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 11/26] bin: manager: add (un)mount command Hannes Laimer
2024-04-24 11:25 ` Gabriel Goller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 12/26] add auto-mounting for removable datastores Hannes Laimer
2024-04-24 13:18 ` Wolfgang Bumiller
2024-04-25 5:32 ` Hannes Laimer
2024-04-25 5:34 ` Hannes Laimer
2024-04-24 13:35 ` Wolfgang Bumiller
2024-04-25 4:59 ` Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 13/26] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 14/26] docs: add removable datastores section Hannes Laimer
2024-04-24 11:53 ` Gabriel Goller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 15/26] ui: add partition selector form Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 16/26] ui: add removable datastore creation support Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 17/26] ui: add (un)mount button to summary Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 18/26] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 19/26] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 20/26] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 21/26] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 22/26] ui: render 'unmount' maintenance mode correctly Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 23/26] api: node: allow creation of removable datastore through directory endpoint Hannes Laimer
2024-04-24 11:56 ` Gabriel Goller
2024-04-24 13:21 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 24/26] api: node: include removable datastores in directory list Hannes Laimer
2024-04-24 13:06 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 25/26] node: disks: replace BASE_MOUNT_DIR with DATASTORE_MOUNT_DIR Hannes Laimer
2024-04-23 8:30 ` [pbs-devel] [PATCH proxmox-backup v9 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=652skntahltrhvy7ftnqezkxjb2orfshcqtujfepkksf7e6cyd@cggigo56vaqq \
--to=w.bumiller@proxmox.com \
--cc=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