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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 491F962B97 for ; Mon, 8 Feb 2021 11:10:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E5522005C for ; Mon, 8 Feb 2021 11:10:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id BAB8320050 for ; Mon, 8 Feb 2021 11:10:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 866DA454E9 for ; Mon, 8 Feb 2021 11:10:10 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 8 Feb 2021 11:10:08 +0100 Message-Id: <20210208101009.2557-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.231 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 1/2] api2/tape/drive: add missing locks for some drive actions 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: Mon, 08 Feb 2021 10:10:11 -0000 else a backup/restore can easily be disrupted Signed-off-by: Dominik Csapak --- src/api2/tape/drive.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs index 29321601..76f15df5 100644 --- a/src/api2/tape/drive.rs +++ b/src/api2/tape/drive.rs @@ -84,8 +84,11 @@ use crate::{ pub async fn load_media(drive: String, label_text: String) -> Result<(), Error> { let (config, _digest) = config::drive::config()?; + let lock_guard = lock_tape_device(&config, &drive)?; tokio::task::spawn_blocking(move || { + let _lock_guard = lock_guard; // keep lock guard + let (mut changer, _) = required_media_changer(&config, &drive)?; changer.load_media(&label_text) }).await? @@ -110,8 +113,11 @@ pub async fn load_media(drive: String, label_text: String) -> Result<(), Error> pub async fn load_slot(drive: String, source_slot: u64) -> Result<(), Error> { let (config, _digest) = config::drive::config()?; + let lock_guard = lock_tape_device(&config, &drive)?; tokio::task::spawn_blocking(move || { + let _lock_guard = lock_guard; // keep lock guard + let (mut changer, _) = required_media_changer(&config, &drive)?; changer.load_media_from_slot(source_slot) }).await? @@ -138,8 +144,11 @@ pub async fn load_slot(drive: String, source_slot: u64) -> Result<(), Error> { pub async fn export_media(drive: String, label_text: String) -> Result { let (config, _digest) = config::drive::config()?; + let lock_guard = lock_tape_device(&config, &drive)?; tokio::task::spawn_blocking(move || { + let _lock_guard = lock_guard; // keep lock guard + let (mut changer, changer_name) = required_media_changer(&config, &drive)?; match changer.export_media(&label_text)? { Some(slot) => Ok(slot), @@ -170,8 +179,11 @@ pub async fn unload( ) -> Result<(), Error> { let (config, _digest) = config::drive::config()?; + let lock_guard = lock_tape_device(&config, &drive)?; tokio::task::spawn_blocking(move || { + let _lock_guard = lock_guard; // keep lock guard + let (mut changer, _) = required_media_changer(&config, &drive)?; changer.unload_media(target_slot) }).await? -- 2.20.1