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 1AC2D6D78B for ; Tue, 28 Sep 2021 13:40:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C0AA0DF94 for ; Tue, 28 Sep 2021 13:40:15 +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 5C273DCB3 for ; Tue, 28 Sep 2021 13:40:06 +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 3373741815 for ; Tue, 28 Sep 2021 13:40:06 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 28 Sep 2021 13:39:41 +0200 Message-Id: <20210928114001.164081-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210928114001.164081-1-f.ebner@proxmox.com> References: <20210928114001.164081-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.303 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. [zfs.pm, directory.pm, lvm.pm, lvmthin.pm] Subject: [pve-devel] [PATCH storage 01/10] api: disks: create: re-check disk after fork/lock 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: Tue, 28 Sep 2021 11:40:50 -0000 Because then it might not be unused anymore. If there really is a race, this prevents e.g. sgdisk creating a partition on a device already in use by LVM or LVM destroying a partitioned device. For ZFS, also get the latest udev info once inside the worker. Signed-off-by: Fabian Ebner --- PVE/API2/Disks/Directory.pm | 2 ++ PVE/API2/Disks/LVM.pm | 2 ++ PVE/API2/Disks/LVMThin.pm | 2 ++ PVE/API2/Disks/ZFS.pm | 10 +++++++--- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/PVE/API2/Disks/Directory.pm b/PVE/API2/Disks/Directory.pm index 2decb89..0068db6 100644 --- a/PVE/API2/Disks/Directory.pm +++ b/PVE/API2/Disks/Directory.pm @@ -212,6 +212,8 @@ __PACKAGE__->register_method ({ my $mountunitpath = "/etc/systemd/system/$mountunitname"; PVE::Diskmanage::locked_disk_action(sub { + PVE::Diskmanage::assert_disk_unused($dev); + # create partition my $cmd = [$SGDISK, '-n1', '-t1:8300', $dev]; print "# ", join(' ', @$cmd), "\n"; diff --git a/PVE/API2/Disks/LVM.pm b/PVE/API2/Disks/LVM.pm index 569e9d1..2c216c0 100644 --- a/PVE/API2/Disks/LVM.pm +++ b/PVE/API2/Disks/LVM.pm @@ -154,6 +154,8 @@ __PACKAGE__->register_method ({ my $worker = sub { PVE::Diskmanage::locked_disk_action(sub { + PVE::Diskmanage::assert_disk_unused($dev); + PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name); if ($param->{add_storage}) { diff --git a/PVE/API2/Disks/LVMThin.pm b/PVE/API2/Disks/LVMThin.pm index 4d303f8..81d91a6 100644 --- a/PVE/API2/Disks/LVMThin.pm +++ b/PVE/API2/Disks/LVMThin.pm @@ -108,6 +108,8 @@ __PACKAGE__->register_method ({ my $worker = sub { PVE::Diskmanage::locked_disk_action(sub { + PVE::Diskmanage::assert_disk_unused($dev); + PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name); my $pv = PVE::Storage::LVMPlugin::lvm_pv_info($dev); # keep some free space just in case diff --git a/PVE/API2/Disks/ZFS.pm b/PVE/API2/Disks/ZFS.pm index 60077c4..885b93c 100644 --- a/PVE/API2/Disks/ZFS.pm +++ b/PVE/API2/Disks/ZFS.pm @@ -345,9 +345,6 @@ __PACKAGE__->register_method ({ foreach my $dev (@$devs) { $dev = PVE::Diskmanage::verify_blockdev_path($dev); PVE::Diskmanage::assert_disk_unused($dev); - my $sysfsdev = $dev =~ s!^/dev/!/sys/block/!r; - my $udevinfo = PVE::Diskmanage::get_udev_info($sysfsdev); - $dev = $udevinfo->{by_id_link} if defined($udevinfo->{by_id_link}); } PVE::Storage::assert_sid_unused($name) if $param->{add_storage}; @@ -374,6 +371,13 @@ __PACKAGE__->register_method ({ my $worker = sub { PVE::Diskmanage::locked_disk_action(sub { + for my $dev (@$devs) { + PVE::Diskmanage::assert_disk_unused($dev); + my $sysfsdev = $dev =~ s!^/dev/!/sys/block/!r; + my $udevinfo = PVE::Diskmanage::get_udev_info($sysfsdev); + $dev = $udevinfo->{by_id_link} if defined($udevinfo->{by_id_link}); + } + # create zpool with desired raidlevel my $cmd = [$ZPOOL, 'create', '-o', "ashift=$ashift", $name]; -- 2.30.2