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 9A2A520EC94 for ; Thu, 25 Apr 2024 08:54:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7D0C71B79C; Thu, 25 Apr 2024 08:54:12 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Thu, 25 Apr 2024 08:52:55 +0200 Message-Id: <20240425065315.42617-7-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240425065315.42617-1-h.laimer@proxmox.com> References: <20240425065315.42617-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 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 v10 06/26] datastore: add helper for checking if a removable datastore is available 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" Co-authored-by: Wolfgang Bumiller Signed-off-by: Hannes Laimer --- pbs-api-types/src/maintenance.rs | 2 +- pbs-datastore/src/datastore.rs | 58 ++++++++++++++++++++++++++++++++ pbs-datastore/src/lib.rs | 2 +- src/bin/proxmox-backup-proxy.rs | 5 ++- 4 files changed, 64 insertions(+), 3 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) -> Result<(), Error> { diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index f9b986c1..4f7865fb 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1,5 +1,6 @@ use std::collections::{HashMap, HashSet}; use std::io::{self, Write}; +use std::os::unix::ffi::OsStrExt; use std::os::unix::io::AsRawFd; use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex}; @@ -14,6 +15,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 +51,52 @@ pub fn check_backup_owner(owner: &Authid, auth_id: &Authid) -> Result<(), Error> Ok(()) } +/// check if a removable datastore is currently available/mounted by +/// comparing the `st_rdev` values of `/dev/disk/by-uuid/` and the source device in +/// /proc/self/mountinfo +pub fn is_datastore_available(config: &DataStoreConfig) -> bool { + use nix::sys::stat::SFlag; + + let uuid = match config.backing_device.as_deref() { + Some(dev) => dev, + None => return true, + }; + + let Some(store_mount_point) = config.get_mount_point() else { + return false; + }; + let store_mount_point = Path::new(&store_mount_point); + + let dev_node = match nix::sys::stat::stat(format!("/dev/disk/by-uuid/{uuid}").as_str()) { + Ok(stat) if SFlag::from_bits_truncate(stat.st_mode) == SFlag::S_IFBLK => stat.st_rdev, + _ => return false, + }; + + let Ok(mount_info) = MountInfo::read() else { + return false; + }; + + for (_, entry) in mount_info { + let Some(source) = entry.mount_source else { + continue; + }; + + if entry.mount_point != store_mount_point || !source.as_bytes().starts_with(b"/") { + continue; + } + + if let Ok(stat) = nix::sys::stat::stat(source.as_os_str()) { + let sflag = SFlag::from_bits_truncate(stat.st_mode); + + if sflag == SFlag::S_IFBLK && stat.st_rdev == dev_node { + return true; + } + } + } + + false +} + /// Datastore Management /// /// A Datastore can store severals backups, and provides the @@ -158,6 +206,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 +315,10 @@ impl DataStore { ) -> Result, 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::{ diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 3a05b1f3..9c7a472d 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -20,7 +20,7 @@ use proxmox_sys::linux::procfs::{Loadavg, ProcFsMemInfo, ProcFsNetDev, ProcFsSta use proxmox_sys::logrotate::LogRotate; use proxmox_sys::{task_log, task_warn}; -use pbs_datastore::DataStore; +use pbs_datastore::{is_datastore_available, DataStore}; use proxmox_rest_server::{ cleanup_old_tasks, cookie_from_header, rotate_task_log_archive, ApiConfig, Redirector, @@ -1143,6 +1143,9 @@ fn collect_disk_stats_sync() -> (DiskStat, Vec) { { continue; } + if !is_datastore_available(&config) { + continue; + } let path = std::path::PathBuf::from(config.absolute_path()); datastores.push(gather_disk_stats(disk_manager.clone(), &path, &config.name)); } -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel