From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server v3 10/10] api: include not mapped resources for running vms in migrate preconditions
Date: Fri, 19 Apr 2024 14:45:49 +0200 [thread overview]
Message-ID: <20240419124556.3334691-15-d.csapak@proxmox.com> (raw)
In-Reply-To: <20240419124556.3334691-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 allowed_nodes too.
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>
---
PVE/API2/Qemu.pm | 39 ++++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index f95d8d95..94aa9942 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 offline 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',
@@ -4518,28 +4520,31 @@ __PACKAGE__->register_method({
# if vm is not running, return target nodes where local storage/mapped devices are available
# for offline migration
+ $res->{allowed_nodes} = [];
+ $res->{not_allowed_nodes} = {};
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->{not_allowed_nodes} = PVE::QemuServer::check_local_storage_availability($vmconf, $storecfg);
+ delete $res->{not_allowed_nodes}->{$localnode};
+ }
- if (!defined($checked_nodes->{$node}->{unavailable_storages})) {
- push @{$res->{allowed_nodes}}, $node;
- }
+ my $merged = { $res->{not_allowed_nodes}->%*, $missing_mappings_by_node->%* };
+ for my $node (keys $merged->%*) {
+ my $missing_mappings = $missing_mappings_by_node->{$node};
+ if (scalar($missing_mappings->@*)) {
+ $res->{not_allowed_nodes}->{$node}->{'unavailable-resources'} = $missing_mappings;
+ next;
+ }
+
+ if (!$res->{running}) {
+ if (!defined($res->{not_allowed_nodes}->{$node}->{unavailable_storages})) {
+ 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'} = [ 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-04-19 12:47 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 12:45 [pve-devel] [PATCH guest-common/qemu-server/manager/docs v3 0/4] implement experimental vgpu live migration Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 1/4] mapping: pci: rework properties check Dominik Csapak
2024-05-31 11:37 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 2/4] mapping: pci: check the mdev configuration on the device too Dominik Csapak
2024-05-31 12:02 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 3/4] mapping: pci: add 'live-migration-capable' flag to mappings Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH guest-common v3 4/4] mapping: remove find_on_current_node Dominik Csapak
2024-05-31 12:09 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 01/10] usb: mapping: move implementation of find_on_current_node here Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 02/10] pci: " Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 03/10] pci: mapping: check mdev config against hardware Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 04/10] stop cleanup: remove unnecessary tpmstate cleanup Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 05/10] vm_stop_cleanup: add noerr parameter Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 06/10] migrate: call vm_stop_cleanup after stopping in phase3_cleanup Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-06-05 8:49 ` Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 07/10] pci: set 'enable-migration' to on for live-migration marked mapped devices Dominik Csapak
2024-05-31 12:56 ` Fiona Ebner
2024-06-05 8:51 ` Dominik Csapak
2024-06-05 9:31 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 08/10] check_local_resources: add more info per mapped device and return as hash Dominik Csapak
2024-05-31 13:05 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH qemu-server v3 09/10] api: enable live migration for marked mapped pci devices Dominik Csapak
2024-05-31 13:13 ` Fiona Ebner
2024-04-19 12:45 ` Dominik Csapak [this message]
2024-05-31 13:37 ` [pve-devel] [PATCH qemu-server v3 10/10] api: include not mapped resources for running vms in migrate preconditions Fiona Ebner
2024-06-05 9:21 ` Dominik Csapak
2024-06-05 9:38 ` Fiona Ebner
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 1/5] mapping: pci: include mdev in config checks Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 2/5] bulk migrate: improve precondition checks Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 3/5] bulk migrate: include checks for live-migratable local resources Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 4/5] ui: adapt migration window to precondition api change Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH manager v3 5/5] fix #5175: ui: allow configuring and live migration of mapped pci resources Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH docs v3 1/2] qm: resource mapping: add description for `mdev` option Dominik Csapak
2024-04-19 12:45 ` [pve-devel] [PATCH docs v3 2/2] qm: resource mapping: document `live-migration-capable` setting Dominik Csapak
2024-05-28 7:25 ` [pve-devel] [PATCH guest-common/qemu-server/manager/docs v3 0/4] implement experimental vgpu live migration Dominik Csapak
2024-05-31 8:11 ` Eneko Lacunza via pve-devel
[not found] ` <954884c6-3a53-4b3a-bdc8-93478037b6a6@binovo.es>
2024-05-31 8:41 ` Dominik Csapak
2024-06-03 8:43 ` Eneko Lacunza via pve-devel
2024-05-31 11:14 ` Fiona Ebner
2024-06-05 8:01 ` Dominik Csapak
2024-05-31 13:40 ` Fiona Ebner
2024-06-06 9:38 ` Dominik Csapak
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=20240419124556.3334691-15-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