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 42EA2A2783 for ; Mon, 19 Jun 2023 11:29:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1220427262 for ; Mon, 19 Jun 2023 11:29:42 +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 for ; Mon, 19 Jun 2023 11:29:39 +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 5D09A468FB for ; Mon, 19 Jun 2023 11:29:39 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 19 Jun 2023 11:29:31 +0200 Message-Id: <20230619092937.604628-5-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230619092937.604628-1-a.lauterer@proxmox.com> References: <20230619092937.604628-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.086 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v5 qemu-server 4/10] qemuserver: migration: test_volid: change attr name and ref handling 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: Mon, 19 Jun 2023 09:29:42 -0000 Since we don't scan all storages for matching disk images anymore for a migration we don't have any images found via storage alone. They will be referenced in the config somewhere. Therefore, there is no need for the 'storage' ref. The 'referenced_in_config' is not really needed and can apply to both, attached and unused disk images. Therefore the QemuServer::foreach_volid() will change the 'referenced_in_config' attribute to an 'is_attached' one that only applies to disk images that are in the _main_ config part and are not unused. In QemuMigrate::scan_local_volumes() we can then quite easily map the refs to each state, attached, unused, referenced_in_{pending,snapshot}. The refs are mostly used for informational use to print out in the logs why a disk image is part of the migration. Except for the 'attached' case. In the future the extra step of the refs in QemuMigrate could probably be streamlined even more. Signed-off-by: Aaron Lauterer --- changes since v4: - drop 'referenced_in_config' in favor of 'is_attached' needed a reordering in test_volid() to have the 'is_unused' attribute available - simplified the setting of the 'ref' property, can be streamlined in the future as we can probably just set it, or a substitute property in test_volid() directly. PVE/QemuMigrate.pm | 20 ++++++++++++-------- PVE/QemuServer.pm | 11 ++++++----- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 4f6ab64..f51904d 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -337,7 +337,7 @@ sub scan_local_volumes { if ($attr->{cdrom}) { if ($volid eq 'cdrom') { my $msg = "can't migrate local cdrom drive"; - if (defined($snaprefs) && !$attr->{referenced_in_config}) { + if (defined($snaprefs) && !$attr->{is_attached}) { my $snapnames = join(', ', sort keys %$snaprefs); $msg .= " (referenced in snapshot - $snapnames)"; } @@ -361,8 +361,10 @@ sub scan_local_volumes { $self->target_storage_check_available($storecfg, $targetsid, $volid); return if $scfg->{shared} && !$self->{opts}->{remote}; - $local_volumes->{$volid}->{ref} = $attr->{referenced_in_config} ? 'config' : 'snapshot'; - $local_volumes->{$volid}->{ref} = 'storage' if $attr->{is_unused}; + $local_volumes->{$volid}->{ref} = 'pending' if $attr->{referenced_in_pending}; + $local_volumes->{$volid}->{ref} = 'snapshot' if $attr->{referenced_in_snapshot}; + $local_volumes->{$volid}->{ref} = 'unused' if $attr->{is_unused}; + $local_volumes->{$volid}->{ref} = 'attached' if $attr->{is_attached}; $local_volumes->{$volid}->{ref} = 'generated' if $attr->{is_tpmstate}; $local_volumes->{$volid}->{bwlimit} = $self->get_bwlimit($sid, $targetsid); @@ -428,14 +430,16 @@ sub scan_local_volumes { foreach my $vol (sort keys %$local_volumes) { my $type = $replicatable_volumes->{$vol} ? 'local, replicated' : 'local'; my $ref = $local_volumes->{$vol}->{ref}; - if ($ref eq 'storage') { - $self->log('info', "found $type disk '$vol' (via storage)\n"); - } elsif ($ref eq 'config') { + if ($ref eq 'attached') { &$log_error("can't live migrate attached local disks without with-local-disks option\n", $vol) if $self->{running} && !$self->{opts}->{"with-local-disks"}; - $self->log('info', "found $type disk '$vol' (in current VM config)\n"); + $self->log('info', "found $type disk '$vol' (attached)\n"); + } elsif ($ref eq 'unused') { + $self->log('info', "found $type disk '$vol' (unused)\n"); } elsif ($ref eq 'snapshot') { $self->log('info', "found $type disk '$vol' (referenced by snapshot(s))\n"); + } elsif ($ref eq 'pending') { + $self->log('info', "found $type disk '$vol' (pending change)\n"); } elsif ($ref eq 'generated') { $self->log('info', "found generated disk '$vol' (in current VM config)\n"); } else { @@ -475,7 +479,7 @@ sub scan_local_volumes { foreach my $volid (sort keys %$local_volumes) { my $ref = $local_volumes->{$volid}->{ref}; - if ($self->{running} && $ref eq 'config') { + if ($self->{running} && $ref eq 'attached') { $local_volumes->{$volid}->{migration_mode} = 'online'; } elsif ($self->{running} && $ref eq 'generated') { # offline migrate the cloud-init ISO and don't regenerate on VM start diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 7666dcb..a49aeea 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4875,8 +4875,12 @@ sub foreach_volid { $volhash->{$volid}->{shared} //= 0; $volhash->{$volid}->{shared} = 1 if $drive->{shared}; - $volhash->{$volid}->{referenced_in_config} //= 0; - $volhash->{$volid}->{referenced_in_config} = 1 if !defined($snapname) && !defined($pending); + $volhash->{$volid}->{is_unused} //= 0; + $volhash->{$volid}->{is_unused} = 1 if $key =~ /^unused\d+$/; + + $volhash->{$volid}->{is_attached} //= 0; + $volhash->{$volid}->{is_attached} = 1 + if !$volhash->{$volid}->{is_unused} && !defined($snapname) && !defined($pending); $volhash->{$volid}->{referenced_in_snapshot}->{$snapname} = 1 if defined($snapname); @@ -4892,9 +4896,6 @@ sub foreach_volid { $volhash->{$volid}->{is_tpmstate} //= 0; $volhash->{$volid}->{is_tpmstate} = 1 if $key eq 'tpmstate0'; - $volhash->{$volid}->{is_unused} //= 0; - $volhash->{$volid}->{is_unused} = 1 if $key =~ /^unused\d+$/; - $volhash->{$volid}->{drivename} = $key if is_valid_drivename($key); }; -- 2.39.2