proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-04 21:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qemuserver: foreach_volid: include pending volumes

Browse Source 
Make it possible to optionally iterate over disks in the pending section
of VMs, similar as to how snapshots are handled already.

This is for example useful in the migration if we don't want to rely on
the scanning of all storages.

All calling sites are adapted and enable it, except for
QemuConfig::get_replicatable_volumes as that would cause a change for
the replication if pending disks would be included.

The following lists the calling sites and if they should be fine with
the change (source [0]):

1. QemuMigrate: scan_local_volumes(): needed to include pending disk
   images
2. API2/Qemu.pm: check_vm_disks_local() for migration precondition:
   related to migration, so more consistent with pending
3. QemuConfig.pm: get_replicatable_volumes(): would change the behavior
   of the replication, will not use it for now.
4. QemuServer.pm: get_vm_volumes(): is used multiple times by:
4a. vm_stop_cleanup() to deactivate/unmap: should also be fine with
    including pending
4b. QemuMigrate.pm: in prepare(): part of migration, so more consistent
    with pending
4c. QemuMigrate.pm: in phase3_cleanup() for deactivation: part of
    migration, so more consistent with pending

[0] https://lists.proxmox.com/pipermail/pve-devel/2023-May/056868.html

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
This commit is contained in:
Aaron Lauterer 2023-06-19 11:29:28 +02:00 committed by Fiona Ebner
parent ec11b92abb
commit 6328c554c1
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Qemu.pm
View File

@ -4232,7 +4232,7 @@ my $check_vm_disks_local = sub {
my $local_disks = {}; my $local_disks = {};
# add some more information to the disks e.g. cdrom # add some more information to the disks e.g. cdrom
PVE::QemuServer::foreach_volid($vmconf, sub { PVE::QemuServer::foreach_volid($vmconf, 1, sub {
my ($volid, $attr) = @_; my ($volid, $attr) = @_;
my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1); my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);

2
PVE/QemuConfig.pm
View File

@ -161,7 +161,7 @@ sub get_replicatable_volumes {
$volhash->{$volid} = 1; $volhash->{$volid} = 1;
}; };
PVE::QemuServer::foreach_volid($conf, $test_volid); PVE::QemuServer::foreach_volid($conf, undef, $test_volid);
return $volhash; return $volhash;
} }

2
PVE/QemuMigrate.pm
View File

@ -468,7 +468,7 @@ sub scan_local_volumes {
if PVE::Storage::volume_is_base_and_used($storecfg, $volid); if PVE::Storage::volume_is_base_and_used($storecfg, $volid);
}; };
PVE::QemuServer::foreach_volid($conf, sub { PVE::QemuServer::foreach_volid($conf, 1, sub {
my ($volid, $attr) = @_; my ($volid, $attr) = @_;
eval { $test_volid->($volid, $attr); }; eval { $test_volid->($volid, $attr); };
if (my $err = $@) { if (my $err = $@) {

15
PVE/QemuServer.pm
View File

@ -4840,12 +4840,12 @@ sub set_migration_caps {
} }
sub foreach_volid { sub foreach_volid {
my ($conf, $func, @param) = @_; my ($conf, $include_pending, $func, @param) = @_;
my $volhash = {}; my $volhash = {};
my $test_volid = sub { my $test_volid = sub {
my ($key, $drive, $snapname) = @_; my ($key, $drive, $snapname, $pending) = @_;
my $volid = $drive->{file}; my $volid = $drive->{file};
return if !$volid; return if !$volid;
@ -4861,11 +4861,13 @@ sub foreach_volid {
$volhash->{$volid}->{shared} = 1 if $drive->{shared}; $volhash->{$volid}->{shared} = 1 if $drive->{shared};
$volhash->{$volid}->{referenced_in_config} //= 0; $volhash->{$volid}->{referenced_in_config} //= 0;
$volhash->{$volid}->{referenced_in_config} = 1 if !defined($snapname); $volhash->{$volid}->{referenced_in_config} = 1 if !defined($snapname) && !defined($pending);
$volhash->{$volid}->{referenced_in_snapshot}->{$snapname} = 1 $volhash->{$volid}->{referenced_in_snapshot}->{$snapname} = 1
if defined($snapname); if defined($snapname);
$volhash->{$volid}->{referenced_in_pending} = 1 if defined($pending);
my $size = $drive->{size}; my $size = $drive->{size};
$volhash->{$volid}->{size} //= $size if $size; $volhash->{$volid}->{size} //= $size if $size;
@ -4887,6 +4889,11 @@ sub foreach_volid {
}; };
PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $test_volid); PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $test_volid);
if ($include_pending && defined($conf->{pending}) && $conf->{pending}->%*) {
PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $test_volid, undef, 1);
}
foreach my $snapname (keys %{$conf->{snapshots}}) { foreach my $snapname (keys %{$conf->{snapshots}}) {
my $snap = $conf->{snapshots}->{$snapname}; my $snap = $conf->{snapshots}->{$snapname};
PVE::QemuConfig->foreach_volume_full($snap, $include_opts, $test_volid, $snapname); PVE::QemuConfig->foreach_volume_full($snap, $include_opts, $test_volid, $snapname);
@ -6141,7 +6148,7 @@ sub get_vm_volumes {
my ($conf) = @_; my ($conf) = @_;
my $vollist = []; my $vollist = [];
foreach_volid($conf, sub { foreach_volid($conf, 1, sub {
my ($volid, $attr) = @_; my ($volid, $attr) = @_;
return if $volid =~ m|^/|; return if $volid =~ m|^/|;