public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server v6 02/10] migrate: call vm_stop_cleanup after stopping in phase3_cleanup
Date: Thu, 13 Feb 2025 14:17:01 +0100	[thread overview]
Message-ID: <20250213131716.3062383-6-d.csapak@proxmox.com> (raw)
In-Reply-To: <20250213131716.3062383-1-d.csapak@proxmox.com>

we currently only call deactivate_volumes, but we actually want to call
the whole vm_stop_cleanup, since that is not invoked by the vm_stop
above (we cannot parse the config anymore) and might do other cleanups
we also want to do (like mdev cleanup).

For this to work properly we have to clone the original config at the
beginning, since we might modify the volids.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
reordered in v6, was 5/11 in v5, no changes otherwise
 PVE/QemuMigrate.pm           | 12 ++++++------
 test/MigrationTest/Shared.pm |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index ed5ede30..c2e36334 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -5,6 +5,7 @@ use warnings;
 
 use IO::File;
 use IPC::Open2;
+use Storable qw(dclone);
 use Time::HiRes qw( usleep );
 
 use PVE::AccessControl;
@@ -1457,7 +1458,8 @@ sub phase3_cleanup {
 
     my $tunnel = $self->{tunnel};
 
-    my $sourcevollist = PVE::QemuServer::get_vm_volumes($conf);
+    # we'll need an unmodified copy of the config later for the cleanup
+    my $oldconf = dclone($conf);
 
     if ($self->{volume_map} && !$self->{opts}->{remote}) {
 	my $target_drives = $self->{target_drive};
@@ -1588,12 +1590,10 @@ sub phase3_cleanup {
 	$self->{errors} = 1;
     }
 
-    # always deactivate volumes - avoid lvm LVs to be active on several nodes
-    eval {
-	PVE::Storage::deactivate_volumes($self->{storecfg}, $sourcevollist);
-    };
+    # stop with nocheck does not do a cleanup, so do it here with the original config
+    eval { PVE::QemuServer::vm_stop_cleanup($self->{storecfg}, $vmid, $oldconf) };
     if (my $err = $@) {
-	$self->log('err', $err);
+	$self->log('err', "Cleanup after stopping VM failed - $err");
 	$self->{errors} = 1;
     }
 
diff --git a/test/MigrationTest/Shared.pm b/test/MigrationTest/Shared.pm
index aa7203d1..e69bf84f 100644
--- a/test/MigrationTest/Shared.pm
+++ b/test/MigrationTest/Shared.pm
@@ -130,6 +130,9 @@ $qemu_server_module->mock(
     clear_reboot_request => sub {
 	return 1;
     },
+    vm_stop_cleanup => sub {
+	return;
+    },
     get_efivars_size => sub {
 	 return 128 * 1024;
     },
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


  parent reply	other threads:[~2025-02-13 13:17 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-13 13:16 [pve-devel] [PATCH (guest-)common/qemu-server/manager/docs v6] implement Dominik Csapak
2025-02-13 13:16 ` [pve-devel] [PATCH common v6 1/1] sysfs tools: add 'nvidia' -> 'mdev' workaround to pci_device_info Dominik Csapak
2025-03-06 13:00   ` [pve-devel] applied: " Thomas Lamprecht
2025-02-13 13:16 ` [pve-devel] [PATCH guest-common v6 1/2] mapping: pci: check the mdev configuration on the device too Dominik Csapak
2025-03-07 10:52   ` Fiona Ebner
2025-02-13 13:16 ` [pve-devel] [PATCH guest-common v6 2/2] mapping: pci: add 'live-migration-capable' flag to mappings Dominik Csapak
2025-03-07 10:52   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH qemu-server v6 01/10] vm stop-cleanup: allow callers to decide error behavior Dominik Csapak
2025-03-06 16:42   ` [pve-devel] applied: " Fiona Ebner
2025-02-13 13:17 ` Dominik Csapak [this message]
2025-03-06 16:42   ` [pve-devel] applied: [PATCH qemu-server v6 02/10] migrate: call vm_stop_cleanup after stopping in phase3_cleanup Fiona Ebner
2025-03-07 11:02     ` Dominik Csapak
2025-02-13 13:17 ` [pve-devel] [PATCH qemu-server v6 03/10] tests: cfg2cmd: fix mdev tests Dominik Csapak
2025-03-07 11:20   ` [pve-devel] applied: " Fiona Ebner
2025-03-07 11:54     ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH qemu-server v6 04/10] pci: mapping: check mdev config against hardware Dominik Csapak
2025-03-07 11:20   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH qemu-server v6 05/10] pci: set 'enable-migration' to on for live-migration marked mapped devices Dominik Csapak
2025-03-07 11:20   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH qemu-server v6 06/10] check_local_resources: add more info per mapped device and return as hash Dominik Csapak
2025-03-07 11:20   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH qemu-server v6 07/10] api: enable live migration for marked mapped pci devices Dominik Csapak
2025-03-07 11:20   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH qemu-server v6 08/10] api: include not mapped resources for running vms in migrate preconditions Dominik Csapak
2025-03-07 12:20   ` Fiona Ebner
2025-03-07 12:56     ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH qemu-server v6 09/10] migrate: show vfio state transferred too Dominik Csapak
2025-03-07 12:35   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH qemu-server v6 10/10] migrate: add transfer summary Dominik Csapak
2025-03-07 12:35   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH manager v6 1/5] mapping: pci: include mdev in config checks Dominik Csapak
2025-03-07 13:00   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH manager v6 2/5] bulk migrate: improve precondition checks Dominik Csapak
2025-03-07 13:19   ` Fiona Ebner
2025-03-07 13:23     ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH manager v6 3/5] bulk migrate: include checks for live-migratable local resources Dominik Csapak
2025-03-07 13:30   ` Fiona Ebner
2025-03-07 13:40     ` Fiona Ebner
2025-03-10 12:52       ` Dominik Csapak
2025-03-10 13:21         ` Fiona Ebner
2025-03-10 13:58           ` Dominik Csapak
2025-03-10 14:40             ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH manager v6 4/5] ui: adapt migration window to precondition api change Dominik Csapak
2025-03-07 14:03   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH manager v6 5/5] fix #5175: ui: allow configuring and live migration of mapped pci resources Dominik Csapak
2025-03-07 14:33   ` Fiona Ebner
2025-02-13 13:17 ` [pve-devel] [PATCH docs v6 1/2] qm: resource mapping: add description for `mdev` option Dominik Csapak
2025-02-13 13:17 ` [pve-devel] [PATCH docs v6 2/2] qm: resource mapping: document `live-migration-capable` setting Dominik Csapak
2025-02-13 13:30 ` [pve-devel] [PATCH (guest-)common/qemu-server/manager/docs v6] implement Dominik Csapak
2025-03-07 14:39 ` Fiona Ebner
2025-03-11 13:23 ` Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250213131716.3062383-6-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal