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 DB8158E5B4 for ; Fri, 11 Nov 2022 16:47:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AAB835CE0 for ; Fri, 11 Nov 2022 16:46:54 +0100 (CET) Received: from nena.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Fri, 11 Nov 2022 16:46:53 +0100 (CET) Received: by nena.proxmox.com (Postfix, from userid 1000) id 361C523051E; Fri, 11 Nov 2022 16:46:47 +0100 (CET) From: Mira Limbeck To: pve-devel@lists.proxmox.com Date: Fri, 11 Nov 2022 16:46:35 +0100 Message-Id: <20221111154635.394997-1-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.653 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [qemuconfig.pm] Subject: [pve-devel] [PATCH v3 qemu-server] fix #4201: delete cloud-init disk on rollback 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: Fri, 11 Nov 2022 15:47:24 -0000 If the config doesn't contain the cloud-init disk anymore after the rollback, we have to clean it up since otherwise no further disk can be attached unless the one still existing on the storage is deleted. Signed-off-by: Mira Limbeck Reviewed-by: Stefan Hanreich Tested-by: Stefan Hanreich --- v3: - rebased on top of master - added R-b/T-b tags from v2 v2: - chose the add_unused_volume way as @fiona recommended, the implementation is a lot cleaner, but contains a cloudinit regex - removed the 2nd patch for reusing already existing disks when adding a cloudinit disk PVE/QemuConfig.pm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm index 0939538..051382c 100644 --- a/PVE/QemuConfig.pm +++ b/PVE/QemuConfig.pm @@ -498,7 +498,7 @@ sub __snapshot_rollback_get_unused { $class->foreach_volume($conf, sub { my ($vs, $volume) = @_; - return if PVE::QemuServer::drive_is_cdrom($volume); + return if PVE::QemuServer::drive_is_cdrom($volume, 1); my $found = 0; my $volid = $volume->{file}; @@ -507,7 +507,7 @@ sub __snapshot_rollback_get_unused { my ($ds, $drive) = @_; return if $found; - return if PVE::QemuServer::drive_is_cdrom($drive); + return if PVE::QemuServer::drive_is_cdrom($drive, 1); $found = 1 if ($drive->{file} && $drive->{file} eq $volid); @@ -519,6 +519,19 @@ sub __snapshot_rollback_get_unused { return $unused; } +sub add_unused_volume { + my ($class, $config, $volid) = @_; + + if ($volid =~ m/vm-\d+-cloudinit/) { + print "found unused cloudinit disk '$volid', removing it\n"; + my $storecfg = PVE::Storage::config(); + PVE::Storage::vdisk_free($storecfg, $volid); + return undef; + } else { + return $class->SUPER::add_unused_volume($config, $volid); + } +} + sub load_current_config { my ($class, $vmid, $current) = @_; -- 2.30.2