From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 91DBF940A8 for ; Wed, 10 Apr 2024 13:04:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6BCC8CDA8 for ; Wed, 10 Apr 2024 13:04:09 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 10 Apr 2024 13:04:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 25B2043C92 for ; Wed, 10 Apr 2024 13:04:05 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 13:03:50 +0200 Message-Id: <20240410110401.2226201-12-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410110401.2226201-1-d.csapak@proxmox.com> References: <20240410110401.2226201-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v2 06/10] migrate: call vm_stop_cleanup after stopping in phase3_cleanup X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2024 11:04:11 -0000 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 --- 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; @@ -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"); $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; + }, get_efivars_size => sub { return 128 * 1024; }, -- 2.39.2