From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server v4 10/12] api: include not mapped resources for running vms in migrate preconditions
Date: Thu, 6 Jun 2024 11:22:11 +0200 [thread overview]
Message-ID: <20240606092220.1190913-17-d.csapak@proxmox.com> (raw)
In-Reply-To: <20240606092220.1190913-1-d.csapak@proxmox.com>
so that we can show a proper warning in the migrate dialog and check it
in the bulk migrate precondition check
the unavailable_storages and should be the same as before, but
we now always return (not_)allowed_nodes too.
to make the code a bit easier to read, reorganize how we construct
the (not_)allowed_nodes properties.
also add a note that we want to redesign the return values here, to make
* the api call simpler
* return better structured values
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v3:
* rework the code a bit so it's easier to read and follow
* properly fill allowed nodes now in the running case too
PVE/API2/Qemu.pm | 45 ++++++++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 19 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 24b82c6e..0a999006 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -4450,18 +4450,20 @@ __PACKAGE__->register_method({
},
},
returns => {
+ # TODO 9.x: rework the api call to return more sensible structures
+ # e.g. a simple list of nodes with their blockers and/or notices to show
type => "object",
properties => {
running => { type => 'boolean' },
allowed_nodes => {
type => 'array',
optional => 1,
- description => "List nodes allowed for offline migration, only passed if VM is offline"
+ description => "List nodes allowed for migration.",
},
not_allowed_nodes => {
type => 'object',
optional => 1,
- description => "List not allowed nodes with additional informations, only passed if VM is offline"
+ description => "List not allowed nodes with additional information.",
},
local_disks => {
type => 'array',
@@ -4510,7 +4512,6 @@ __PACKAGE__->register_method({
my ($local_resources, $mapped_resources, $missing_mappings_by_node) =
PVE::QemuServer::check_local_resources($vmconf, 1);
- delete $missing_mappings_by_node->{$localnode};
my $vga = PVE::QemuServer::parse_vga($vmconf->{vga});
if ($res->{running} && $vga->{'clipboard'} && $vga->{'clipboard'} eq 'vnc') {
@@ -4519,28 +4520,34 @@ __PACKAGE__->register_method({
# if vm is not running, return target nodes where local storage/mapped devices are available
# for offline migration
- if (!$res->{running}) {
- $res->{allowed_nodes} = [];
- my $checked_nodes = PVE::QemuServer::check_local_storage_availability($vmconf, $storecfg);
- delete $checked_nodes->{$localnode};
-
- foreach my $node (keys %$checked_nodes) {
- my $missing_mappings = $missing_mappings_by_node->{$node};
- if (scalar($missing_mappings->@*)) {
- $checked_nodes->{$node}->{'unavailable-resources'} = $missing_mappings;
- next;
- }
+ $res->{allowed_nodes} = [];
+ $res->{not_allowed_nodes} = {};
- if (!defined($checked_nodes->{$node}->{unavailable_storages})) {
- push @{$res->{allowed_nodes}}, $node;
- }
+ my $storage_nodehash = PVE::QemuServer::check_local_storage_availability($vmconf, $storecfg);
+
+ my $nodelist = PVE::Cluster::get_nodelist();
+ for my $node ($nodelist->@*) {
+ next if $node eq $localnode;
+
+ # extract missing storage info
+ if (my $storage_info = $storage_nodehash->{$node}) {
+ $res->{not_allowed_nodes}->{$node} = $storage_info;
+ }
+
+ # extract missing mappings info
+ my $missing_mappings = $missing_mappings_by_node->{$node};
+ if (scalar($missing_mappings->@*)) {
+ $res->{not_allowed_nodes}->{$node}->{'unavailable-resources'} = $missing_mappings;
+ }
+ # if nothing came up, add it to the allowed nodes
+ if (!$res->{not_allowed_nodes}->{$node}) {
+ push $res->{allowed_nodes}->@*, $node;
}
- $res->{not_allowed_nodes} = $checked_nodes;
}
my $local_disks = &$check_vm_disks_local($storecfg, $vmconf, $vmid);
- $res->{local_disks} = [ values %$local_disks ];;
+ $res->{local_disks} = [ values %$local_disks ];
$res->{local_resources} = $local_resources;
$res->{'mapped-resources'} = [ sort keys $mapped_resources->%* ];
--
2.39.2
_______________________________________________
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-06-06 9:22 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 9:21 [pve-devel] [PATCH guest-common/qemu-server/manager/docs v4] implement experimental vgpu live migration Dominik Csapak
2024-06-06 9:21 ` [pve-devel] [PATCH guest-common v4 1/6] mapping: pci: assert_valid: rename cfg to mapping Dominik Csapak
2024-07-05 8:22 ` [pve-devel] applied: " Thomas Lamprecht
2024-06-06 9:21 ` [pve-devel] [PATCH guest-common v4 2/6] mapping: pci: assert_valid: reword error messages Dominik Csapak
2024-07-05 8:22 ` [pve-devel] applied: " Thomas Lamprecht
2024-06-06 9:21 ` [pve-devel] [PATCH guest-common v4 3/6] mapping: pci: make sure all desired properties are checked Dominik Csapak
2024-07-05 8:22 ` [pve-devel] applied: " Thomas Lamprecht
2024-06-06 9:21 ` [pve-devel] [PATCH guest-common v4 4/6] mapping: pci: check the mdev configuration on the device too Dominik Csapak
2024-07-05 8:33 ` Thomas Lamprecht
2024-06-06 9:22 ` [pve-devel] [PATCH guest-common v4 5/6] mapping: pci: add 'live-migration-capable' flag to mappings Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH guest-common v4 6/6] mapping: remove find_on_current_node Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 01/12] usb: mapping: move implementation of find_on_current_node here Dominik Csapak
2024-07-04 11:29 ` Thomas Lamprecht
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 02/12] pci: " Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 03/12] pci: mapping: check mdev config against hardware Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 04/12] stop cleanup: remove unnecessary tpmstate cleanup Dominik Csapak
2024-07-05 8:36 ` [pve-devel] applied: " Thomas Lamprecht
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 05/12] vm_stop_cleanup: add noerr parameter Dominik Csapak
2024-07-04 12:24 ` Thomas Lamprecht
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 06/12] migrate: call vm_stop_cleanup after stopping in phase3_cleanup Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 07/12] pci: set 'enable-migration' to on for live-migration marked mapped devices Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 08/12] check_local_resources: add more info per mapped device and return as hash Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 09/12] api: enable live migration for marked mapped pci devices Dominik Csapak
2024-06-06 9:22 ` Dominik Csapak [this message]
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 11/12] tests: cfg2cmd: fix mdev tests Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH qemu-server v4 12/12] migration: show vfio state transferred too Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 1/5] mapping: pci: include mdev in config checks Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 2/5] bulk migrate: improve precondition checks Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 3/5] bulk migrate: include checks for live-migratable local resources Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 4/5] ui: adapt migration window to precondition api change Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH manager v4 5/5] fix #5175: ui: allow configuring and live migration of mapped pci resources Dominik Csapak
2024-06-06 9:22 ` [pve-devel] [PATCH docs v4 1/2] qm: resource mapping: add description for `mdev` option Dominik Csapak
2024-08-14 14:14 ` Alexander Zeidler
2024-06-06 9:22 ` [pve-devel] [PATCH docs v4 2/2] qm: resource mapping: document `live-migration-capable` setting Dominik Csapak
2024-07-05 9:00 ` [pve-devel] [PATCH guest-common/qemu-server/manager/docs v4] implement experimental vgpu live migration Thomas Lamprecht
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=20240606092220.1190913-17-d.csapak@proxmox.com \
--to=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