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 E49C071F8F for ; Wed, 30 Jun 2021 17:58:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E2FA51BD3B for ; Wed, 30 Jun 2021 17:58:12 +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 id 17AAF1BD0D for ; Wed, 30 Jun 2021 17:58:11 +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 DD82246813 for ; Wed, 30 Jun 2021 17:58:10 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Wed, 30 Jun 2021 17:57:58 +0200 Message-Id: <20210630155759.1894155-5-s.reiter@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210630155759.1894155-1-s.reiter@proxmox.com> References: <20210630155759.1894155-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.685 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [disk.rs] Subject: [pbs-devel] [PATCH proxmox-backup 4/5] file-restore-daemon/disk: ignore already-mounted error and prefix zpool 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: Wed, 30 Jun 2021 15:58:12 -0000 Prefix zpool mount paths to avoid clashing with other mount namespaces (like LVM). Also ignore "already-mounted" error and return it as success instead - as we always assume that a mount path is unique, this is a safe assumption, as nothing else could have been mounted here. This fixes an issue where a mountpoint=legacy subvol might be available on different disks, and thus have different Bucket instances that don't share the mountpoint cache, which could lead to an error if the user tried opening it multiple times on different disks. Signed-off-by: Stefan Reiter --- src/bin/proxmox_restore_daemon/disk.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/proxmox_restore_daemon/disk.rs b/src/bin/proxmox_restore_daemon/disk.rs index f8f67d83..cae62af3 100644 --- a/src/bin/proxmox_restore_daemon/disk.rs +++ b/src/bin/proxmox_restore_daemon/disk.rs @@ -192,7 +192,7 @@ impl Filesystems { return Ok(mp.clone()); } - let mntpath = format!("/mnt/{}", &data.name); + let mntpath = format!("/mnt/zpool/{}", &data.name); create_dir_all(&mntpath)?; // call ZFS tools to import and mount the pool with the root mount at 'mntpath' @@ -285,6 +285,7 @@ impl Filesystems { return Ok(()); } Err(nix::Error::Sys(nix::errno::Errno::EINVAL)) => {} + Err(nix::Error::Sys(nix::errno::Errno::EBUSY)) => return Ok(()), Err(err) => { warn!("mount error on '{}' ({}) - {}", source, fs, err); } -- 2.30.2