From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 2BBF21FF396 for ; Thu, 6 Jun 2024 11:23:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8AF21B25F; Thu, 6 Jun 2024 11:23:03 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Jun 2024 11:22:07 +0200 Message-Id: <20240606092220.1190913-13-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606092220.1190913-1-d.csapak@proxmox.com> References: <20240606092220.1190913-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH qemu-server v4 06/12] 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 --- changes from v3: * reword error message * change 'return 1' to 'return' in test 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 33d5b2d1..4cad14ef 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; @@ -1458,7 +1459,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}; @@ -1589,12 +1591,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.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel