qemuserver: migration: test_volid: change attr name and ref handling

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 <a.lauterer@proxmox.com>

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 023e004469f7116668313c99bfed4ce7e259db44..97a9fbba10ee7b0d0a86ebbbb388b50fc7963e5e 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -354,7 +354,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)";
                    }
@@ -378,8 +378,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);
@@ -445,14 +447,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 {
@@ -492,7 +496,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 a573f0623e37e97a1f358acd7cbd3c98b657de9b..df44e6fbfb3023f176e94d21e4e339375f494d61 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4860,8 +4860,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);
@@ -4877,9 +4881,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);
     };