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>
my $local_disks = {};
# add some more information to the disks e.g. cdrom
my $local_disks = {};
# 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 ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
my ($volid, $attr) = @_;
my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
$volhash->{$volid} = 1;
};
$volhash->{$volid} = 1;
};
- PVE::QemuServer::foreach_volid($conf, $test_volid);
+ PVE::QemuServer::foreach_volid($conf, undef, $test_volid);
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) = @_;
eval { $test_volid->($volid, $attr); };
if (my $err = $@) {
my ($volid, $attr) = @_;
eval { $test_volid->($volid, $attr); };
if (my $err = $@) {
- my ($conf, $func, @param) = @_;
+ my ($conf, $include_pending, $func, @param) = @_;
my $volhash = {};
my $test_volid = sub {
my $volhash = {};
my $test_volid = sub {
- my ($key, $drive, $snapname) = @_;
+ my ($key, $drive, $snapname, $pending) = @_;
my $volid = $drive->{file};
return if !$volid;
my $volid = $drive->{file};
return if !$volid;
$volhash->{$volid}->{shared} = 1 if $drive->{shared};
$volhash->{$volid}->{referenced_in_config} //= 0;
$volhash->{$volid}->{shared} = 1 if $drive->{shared};
$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
if defined($snapname);
$volhash->{$volid}->{referenced_in_snapshot}->{$snapname} = 1
if defined($snapname);
+ $volhash->{$volid}->{referenced_in_pending} = 1 if defined($pending);
+
my $size = $drive->{size};
$volhash->{$volid}->{size} //= $size if $size;
my $size = $drive->{size};
$volhash->{$volid}->{size} //= $size if $size;
};
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}}) {
my $snap = $conf->{snapshots}->{$snapname};
PVE::QemuConfig->foreach_volume_full($snap, $include_opts, $test_volid, $snapname);
foreach my $snapname (keys %{$conf->{snapshots}}) {
my $snap = $conf->{snapshots}->{$snapname};
PVE::QemuConfig->foreach_volume_full($snap, $include_opts, $test_volid, $snapname);
my ($conf) = @_;
my $vollist = [];
my ($conf) = @_;
my $vollist = [];
- foreach_volid($conf, sub {
+ foreach_volid($conf, 1, sub {
my ($volid, $attr) = @_;
return if $volid =~ m|^/|;
my ($volid, $attr) = @_;
return if $volid =~ m|^/|;