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 0ECE863C62 for ; Thu, 27 Jan 2022 11:56:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EFF9B215A3 for ; Thu, 27 Jan 2022 11:56:03 +0100 (CET) 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 6951D2156F for ; Thu, 27 Jan 2022 11:56:02 +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 3A49046CE0 for ; Thu, 27 Jan 2022 11:56:02 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 27 Jan 2022 11:55:56 +0100 Message-Id: <20220127105601.2741602-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220127105601.2741602-1-d.csapak@proxmox.com> References: <20220127105601.2741602-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.161 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 Subject: [pve-devel] [PATCH proxmox-backup 3/5] restore-daemon: avoid auto-mounting zpools X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jan 2022 10:56:04 -0000 the duration of mounting zpools not only correspond to the number of disks, but also to the content (many subvols for example) which we cannot know beforehand. so avoid mounting them at the start, and mount it only when the user requests a listing/extraction with the zpool in path Signed-off-by: Dominik Csapak --- .../src/proxmox_restore_daemon/disk.rs | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs index 4e43662e..d6fc2f04 100644 --- a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs +++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs @@ -460,30 +460,12 @@ impl DiskState { cmd.args(["import", "-d", "/dev"].iter()); let result = run_command(cmd, None).unwrap(); for (pool, disks) in Self::parse_zpool_import(&result) { - let mut bucket = Bucket::ZPool(ZFSBucketData { + let bucket = Bucket::ZPool(ZFSBucketData { name: pool.clone(), size: None, mountpoint: None, }); - // anything more than 5 disks we assume to take too long to mount, so we don't - // automatically - this means that no size can be reported - if disks.len() <= 5 { - let mp = filesystems.ensure_mounted(&mut bucket); - info!( - "zpool '{}' (on: {:?}) auto-mounted at '{:?}' (size: {:?})", - &pool, - &disks, - mp, - bucket.size(0) - ); - } else { - info!( - "zpool '{}' (on: {:?}) auto-mount skipped, too many disks", - &pool, &disks - ); - } - for disk in disks { if let Some(fidx) = drive_info.get(&disk) { match disk_map.get_mut(fidx) { -- 2.30.2