From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH qemu-server v14 6/12] migration: check_local_resources for virtiofs
Date: Wed, 02 Apr 2025 15:13:42 +0200 [thread overview]
Message-ID: <1743599225.6t6wsyqqoe.astroid@yuna.none> (raw)
In-Reply-To: <20250304115803.194820-7-m.frank@proxmox.com>
On March 4, 2025 12:57 pm, 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>
> Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> v14:
> * nothing changed
>
> PVE/QemuServer.pm | 12 +++++++++++-
> test/MigrationTest/Shared.pm | 7 +++++++
> 2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 748b0acf..648b28cd 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,16 @@ sub check_local_resources {
> push @$mapped_res, $k;
> }
> }
> + if ($k =~ m/^virtiofs/) {
> + my $entry = parse_property_string('pve-qm-virtiofs', $conf->{$k});
> + if ($entry->{dirid}) {
dirid is not optional?
> + $add_missing_mapping->('dir', $k, $entry->{dirid});
> + push @$mapped_res, $k;
> + }
> + }
> # 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 aa7203d1..c5d07222 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 {
> --
> 2.39.5
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
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:[~2025-04-02 13:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-04 11:57 [pve-devel] [PATCH cluster/guest-common/docs/qemu-server/manager v14 0/12] virtiofs Markus Frank
2025-03-04 11:57 ` [pve-devel] [PATCH cluster v14 1/12] add mapping/dir.cfg for resource mapping Markus Frank
2025-03-04 11:57 ` [pve-devel] [PATCH guest-common v14 2/12] add dir mapping section config Markus Frank
2025-04-02 13:14 ` Fabian Grünbichler
2025-04-02 15:20 ` Markus Frank
2025-04-02 13:41 ` Daniel Kral
2025-03-04 11:57 ` [pve-devel] [PATCH docs v14 3/12] add doc section for the shared filesystem virtio-fs Markus Frank
2025-04-02 10:36 ` Laurențiu Leahu-Vlăducu
2025-04-02 13:13 ` Fabian Grünbichler
2025-04-02 13:44 ` Daniel Kral
2025-03-04 11:57 ` [pve-devel] [PATCH qemu-server v14 4/12] control: add virtiofsd as runtime dependency for qemu-server Markus Frank
2025-03-04 11:57 ` [pve-devel] [PATCH qemu-server v14 5/12] fix #1027: virtio-fs support Markus Frank
2025-04-02 13:13 ` Fabian Grünbichler
2025-03-04 11:57 ` [pve-devel] [PATCH qemu-server v14 6/12] migration: check_local_resources for virtiofs Markus Frank
2025-04-02 13:13 ` Fabian Grünbichler [this message]
2025-03-04 11:57 ` [pve-devel] [PATCH qemu-server v14 7/12] disable snapshot (with RAM) and hibernate with virtio-fs devices Markus Frank
2025-03-04 11:57 ` [pve-devel] [PATCH manager v14 08/12] api: add resource map api endpoints for directories Markus Frank
2025-03-04 11:58 ` [pve-devel] [PATCH manager v14 09/12] ui: add edit window for dir mappings Markus Frank
2025-03-04 11:58 ` [pve-devel] [PATCH manager v14 10/12] ui: add resource mapping view for directories Markus Frank
2025-04-02 10:36 ` Laurențiu Leahu-Vlăducu
2025-04-02 13:42 ` Daniel Kral
2025-03-04 11:58 ` [pve-devel] [PATCH manager v14 11/12] ui: form: add selector for directory mappings Markus Frank
2025-03-04 11:58 ` [pve-devel] [PATCH manager v14 12/12] ui: add options to add virtio-fs to qemu config Markus Frank
2025-04-02 10:36 ` Laurențiu Leahu-Vlăducu
2025-04-02 14:06 ` Daniel Kral
2025-04-02 13:42 ` Daniel Kral
2025-03-18 9:14 ` [pve-devel] [PATCH cluster/guest-common/docs/qemu-server/manager v14 0/12] virtiofs Markus Frank
2025-04-02 10:36 ` Laurențiu Leahu-Vlăducu
2025-04-02 13:17 ` Fabian Grünbichler
2025-04-02 13:45 ` Daniel Kral
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=1743599225.6t6wsyqqoe.astroid@yuna.none \
--to=f.gruenbichler@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