From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CF4A5C2C0 for ; Fri, 15 Sep 2023 08:55:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8AE858690 for ; Fri, 15 Sep 2023 08:55:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 15 Sep 2023 08:55:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3E9514754D for ; Fri, 15 Sep 2023 08:55:04 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 15 Sep 2023 08:54:40 +0200 Message-Id: <20230915065457.352953-7-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915065457.352953-1-h.laimer@proxmox.com> References: <20230915065457.352953-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.016 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 06/23] 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: , X-List-Received-Date: Fri, 15 Sep 2023 06:55:34 -0000 Signed-off-by: Hannes Laimer --- pbs-datastore/src/datastore.rs | 18 ++++++++++++++++++ pbs-datastore/src/lib.rs | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 29b9c779..ae9589d2 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -49,6 +49,22 @@ pub fn check_backup_owner(owner: &Authid, auth_id: &Authid) -> Result<(), Error> Ok(()) } +pub fn check_if_available(config: &DataStoreConfig) -> Result<(), Error> { + config.backing_device.as_ref().map_or(Ok(()), |uuid| { + let mut command = std::process::Command::new("findmnt"); + command.args(["-n", "-o", "TARGET", "--source", &format!("UUID={}", uuid)]); + + match proxmox_sys::command::run_command(command, None) { + Ok(mount_point) if mount_point.trim_end() == config.path => Ok(()), + _ => Err(format_err!( + "device for datastore '{}' has to be mounted at '{}'", + config.name, + config.path + )), + } + }) +} + /// Datastore Management /// /// A Datastore can store severals backups, and provides the @@ -225,6 +241,8 @@ impl DataStore { ) -> Result, Error> { let name = config.name.clone(); + check_if_available(&config)?; + 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 b09fd114..52326b4d 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, check_if_available, DataStore}; mod hierarchy; pub use hierarchy::{ -- 2.39.2