From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id C84CE1FF189
for <inbox@lore.proxmox.com>; Fri, 4 Apr 2025 14:18:27 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 76FA31DE4B;
Fri, 4 Apr 2025 14:18:15 +0200 (CEST)
Message-ID: <0c23f0d9-790a-416e-aa6f-4f4a94d51c33@proxmox.com>
Date: Fri, 4 Apr 2025 14:18:11 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Markus Frank <m.frank@proxmox.com>
References: <20250403103442.136958-1-m.frank@proxmox.com>
<20250403103442.136958-7-m.frank@proxmox.com>
Content-Language: en-US
From: Daniel Kral <d.kral@proxmox.com>
In-Reply-To: <20250403103442.136958-7-m.frank@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.012 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: Re: [pve-devel] [PATCH qemu-server v15 6/12] migration:
check_local_resources for virtiofs
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
This patch did not apply correctly anymore since there were some other
patches applied upstream since last time.
A comment about that inline.
On 4/3/25 12:34, Markus Frank wrote:
> add dir mapping checks to check_local_resources
>
> Since the VM needs to be powered off for migration, migration should
> work with a directory on shared storage with all caching settings.
>
> Signed-off-by: Markus Frank <m.frank@proxmox.com>
> ---
> v15:
> * removed unnecessary "if ($entry->{dirid})" check
>
> PVE/QemuServer.pm | 10 +++++++++-
> test/MigrationTest/Shared.pm | 7 +++++++
> 2 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 558b924d..5e9c3981 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -2486,6 +2486,7 @@ sub check_local_resources {
> my $nodelist = PVE::Cluster::get_nodelist();
> my $pci_map = PVE::Mapping::PCI::config();
> my $usb_map = PVE::Mapping::USB::config();
> + my $dir_map = PVE::Mapping::Dir::config();
>
> my $missing_mappings_by_node = { map { $_ => [] } @$nodelist };
>
> @@ -2497,6 +2498,8 @@ sub check_local_resources {
> $entry = PVE::Mapping::PCI::get_node_mapping($pci_map, $id, $node);
> } elsif ($type eq 'usb') {
> $entry = PVE::Mapping::USB::get_node_mapping($usb_map, $id, $node);
> + } elsif ($type eq 'dir') {
> + $entry = PVE::Mapping::Dir::get_node_mapping($dir_map, $id, $node);
> }
> if (!scalar($entry->@*)) {
> push @{$missing_mappings_by_node->{$node}}, $key;
> @@ -2525,9 +2528,14 @@ sub check_local_resources {
> push @$mapped_res, $k;
> }
> }
> + if ($k =~ m/^virtiofs/) {
> + my $entry = parse_property_string('pve-qm-virtiofs', $conf->{$k});
> + $add_missing_mapping->('dir', $k, $entry->{dirid});
> + push @$mapped_res, $k;
0f55e8be ("api: migration preconditions: return detailed info for
mapped-resources") changed the $mapped_res to a hash reference.
I've replaced this locally on my test nodes with to make it work again:
$mapped_res->{$k} = { name => $entry->{dirid} };
> + }
> # sockets are safe: they will recreated be on the target side post-migrate
> next if $k =~ m/^serial/ && ($conf->{$k} eq 'socket');
> - push @loc_res, $k if $k =~ m/^(usb|hostpci|serial|parallel)\d+$/;
> + push @loc_res, $k if $k =~ m/^(usb|hostpci|serial|parallel|virtiofs)\d+$/;
> }
>
> die "VM uses local resources\n" if scalar @loc_res && !$noerr;
> diff --git a/test/MigrationTest/Shared.pm b/test/MigrationTest/Shared.pm
> index e69bf84f..f5fb70ff 100644
> --- a/test/MigrationTest/Shared.pm
> +++ b/test/MigrationTest/Shared.pm
> @@ -90,6 +90,13 @@ $mapping_pci_module->mock(
> },
> );
>
> +our $mapping_dir_module = Test::MockModule->new("PVE::Mapping::Dir");
> +$mapping_dir_module->mock(
> + config => sub {
> + return {};
> + },
> +);
> +
> our $ha_config_module = Test::MockModule->new("PVE::HA::Config");
> $ha_config_module->mock(
> vm_is_ha_managed => sub {
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel