From: Fiona Ebner <f.ebner@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: Re: [pve-devel] [PATCH qemu-server v3 06/10] migrate: call vm_stop_cleanup after stopping in phase3_cleanup
Date: Fri, 31 May 2024 14:56:53 +0200 [thread overview]
Message-ID: <2b153bfe-9e0b-44ff-a77d-4f0173188ccb@proxmox.com> (raw)
In-Reply-To: <20240419124556.3334691-11-d.csapak@proxmox.com>
Am 19.04.24 um 14:45 schrieb Dominik Csapak:
> 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>
> ---
> 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 8d9b35ae..381022f5 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::Cluster;
Needs a rebase (because of added include for PVE::AccessControl)
> @@ -1455,7 +1456,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};
> @@ -1586,12 +1588,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 for vm failed - $err");
Nit: "Cleanup after stopping VM failed"
Is it better to only execute this in case vm_stop() did not return an
error? Although I guess attempting cleanup in that case also doesn't hurt.
> $self->{errors} = 1;
> }
>
> diff --git a/test/MigrationTest/Shared.pm b/test/MigrationTest/Shared.pm
> index aa7203d1..2347e60a 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 1;
Nit: I'd just have it be return; without a value.
> + },
> get_efivars_size => sub {
> return 128 * 1024;
> },
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-05-31 12:57 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 12:45 [pve-devel] [PATCH guest-common/qemu-server/manager/docs v3 0/4] implement experimental vgpu live migration Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 1/4] mapping: pci: rework properties check Dominik Csapak
2024-05-31 11:37 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 2/4] mapping: pci: check the mdev configuration on the device too Dominik Csapak
2024-05-31 12:02 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 3/4] mapping: pci: add 'live-migration-capable' flag to mappings Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 4/4] mapping: remove find_on_current_node Dominik Csapak
2024-05-31 12:09 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 01/10] usb: mapping: move implementation of find_on_current_node here Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 02/10] pci: " Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 03/10] pci: mapping: check mdev config against hardware Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 04/10] stop cleanup: remove unnecessary tpmstate cleanup Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 05/10] vm_stop_cleanup: add noerr parameter Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 06/10] migrate: call vm_stop_cleanup after stopping in phase3_cleanup Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner [this message]
2024-06-05 8:49 ` Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 07/10] pci: set 'enable-migration' to on for live-migration marked mapped devices Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-06-05 8:51 ` Dominik Csapak
2024-06-05 9:31 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 08/10] check_local_resources: add more info per mapped device and return as hash Dominik Csapak
2024-05-31 13:05 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 09/10] api: enable live migration for marked mapped pci devices Dominik Csapak
2024-05-31 13:13 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 10/10] api: include not mapped resources for running vms in migrate preconditions Dominik Csapak
2024-05-31 13:37 ` Fiona Ebner
2024-06-05 9:21 ` Dominik Csapak
2024-06-05 9:38 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 1/5] mapping: pci: include mdev in config checks Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 2/5] bulk migrate: improve precondition checks Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 3/5] bulk migrate: include checks for live-migratable local resources Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 4/5] ui: adapt migration window to precondition api change Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 5/5] fix #5175: ui: allow configuring and live migration of mapped pci resources Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH docs v3 1/2] qm: resource mapping: add description for `mdev` option Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH docs v3 2/2] qm: resource mapping: document `live-migration-capable` setting Dominik Csapak
2024-05-28 7:25 ` [pve-devel] [PATCH guest-common/qemu-server/manager/docs v3 0/4] implement experimental vgpu live migration Dominik Csapak
2024-05-31 8:11 ` Eneko Lacunza via pve-devel
[not found] ` <954884c6-3a53-4b3a-bdc8-93478037b6a6@binovo.es>
2024-05-31 8:41 ` Dominik Csapak
2024-06-03 8:43 ` Eneko Lacunza via pve-devel
2024-05-31 11:14 ` Fiona Ebner
2024-06-05 8:01 ` Dominik Csapak
2024-05-31 13:40 ` Fiona Ebner
2024-06-06 9:38 ` 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=2b153bfe-9e0b-44ff-a77d-4f0173188ccb@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=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