From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v3 qemu-server 12/13] memory: virtio-mem : implement redispatch retry.
Date: Thu, 2 Feb 2023 12:03:43 +0100 [thread overview]
Message-ID: <20230202110344.840195-13-aderumier@odiso.com> (raw)
In-Reply-To: <20230202110344.840195-1-aderumier@odiso.com>
If some memory can be removed on a specific node,
we try to rebalance again on other nodes
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
PVE/QemuServer/Memory.pm | 54 ++++++++++++++++++++++++++--------------
1 file changed, 36 insertions(+), 18 deletions(-)
diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
index 9e81719..a16bdb2 100644
--- a/PVE/QemuServer/Memory.pm
+++ b/PVE/QemuServer/Memory.pm
@@ -197,23 +197,35 @@ my sub get_virtiomem_total_current_size {
return $size;
}
+my sub get_virtiomem_total_errors_size {
+ my ($mems) = @_;
+
+ my $size = 0;
+ for my $mem (values %$mems) {
+ next if !$mem->{error};
+ $size += $mem->{current};
+ }
+ return $size;
+}
+
my sub balance_virtiomem {
my ($vmid, $virtiomems, $blocksize, $target_virtiomem_total) = @_;
- my $nb_virtiomem = keys %$virtiomems;
+ my $virtiomem_total_noerror = scalar(grep { !$_->{error} } values $virtiomems->%*);
- print"try to balance memory on $nb_virtiomem virtiomems\n";
+ print"try to balance memory on $virtiomem_total_noerror remaining virtiomems\n";
die "error. no more available blocks in virtiomem to balance the remaining memory" if $target_virtiomem_total < 0;
+ die "error. No more available virtiomem to balance the remaining memory\n" if $virtiomem_total_noerror == 0;
- #if we can't share exactly the same amount, we add the remainder on last node
- my $virtiomem_target_aligned = int( $target_virtiomem_total / $nb_virtiomem / $blocksize) * $blocksize;
- my $virtiomem_target_remaining = $target_virtiomem_total - ($virtiomem_target_aligned * ($nb_virtiomem-1));
+ my $virtiomem_target_aligned = int( $target_virtiomem_total / $virtiomem_total_noerror / $blocksize) * $blocksize;
+ my $virtiomem_target_remaining = $target_virtiomem_total - ($virtiomem_target_aligned * ($virtiomem_total_noerror-1));
my $i = 0;
foreach my $id (sort keys %$virtiomems) {
my $virtiomem = $virtiomems->{$id};
+ next if $virtiomem->{error};
$i++;
- my $virtiomem_target = $i == $nb_virtiomem ? $virtiomem_target_remaining : $virtiomem_target_aligned;
+ my $virtiomem_target = $i == $virtiomem_total_noerror ? $virtiomem_target_remaining : $virtiomem_target_aligned;
$virtiomem->{completed} = 0;
$virtiomem->{retry} = 0;
$virtiomem->{target} = $virtiomem_target;
@@ -370,18 +382,24 @@ sub qemu_memory_hotplug {
};
}
- my $target_virtiomem_total = $value - $static_memory;
- my $err;
- eval {
- balance_virtiomem($vmid, $virtiomems, $blocksize, $target_virtiomem_total);
- };
- $err = $@ if $@;
-
- my $current_memory = $static_memory + get_virtiomem_total_current_size($virtiomems);
- $newmem->{current} = $current_memory;
- $conf->{memory} = print_memory($newmem);
- PVE::QemuConfig->write_config($vmid, $conf);
- die $err if $err;
+ while (1) {
+
+ my $target_virtiomem_total = $value - $static_memory - get_virtiomem_total_errors_size($virtiomems);
+ my $err;
+ eval {
+ balance_virtiomem($vmid, $virtiomems, $blocksize, $target_virtiomem_total);
+ };
+ $err = $@ if $@;
+
+ my $current_memory = $static_memory + get_virtiomem_total_current_size($virtiomems);
+ $newmem->{current} = $current_memory;
+ $conf->{memory} = print_memory($newmem);
+ PVE::QemuConfig->write_config($vmid, $conf);
+
+ die $err if $err;
+ last if $current_memory == $value;
+ }
+ return $conf->{memory};
} elsif ($value > $memory) {
--
2.30.2
next prev parent reply other threads:[~2023-02-02 11:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-02 11:03 [pve-devel] [PATCH v3 qemu-server 00/13] rework memory hotplug + virtiomem Alexandre Derumier
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 01/13] memory: extract some code to their own sub for mocking Alexandre Derumier
2023-02-03 13:44 ` Fiona Ebner
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 02/13] tests: add memory tests Alexandre Derumier
2023-02-03 13:44 ` Fiona Ebner
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 03/13] qemu_memory_hotplug: remove unused $opt arg Alexandre Derumier
2023-02-03 13:56 ` [pve-devel] applied: " Fiona Ebner
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 04/13] add memory parser Alexandre Derumier
2023-02-03 13:44 ` Fiona Ebner
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 05/13] memory: add get_static_mem && remove parse_hotplug_features Alexandre Derumier
2023-02-03 13:44 ` Fiona Ebner
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 06/13] config: memory: add 'max' option Alexandre Derumier
2023-02-03 13:44 ` Fiona Ebner
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 07/13] memory: get_max_mem: use config memory max Alexandre Derumier
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 08/13] memory: don't use foreach_reversedimm for unplug Alexandre Derumier
2023-02-03 13:45 ` Fiona Ebner
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 09/13] memory: use 64 slots && static dimm size when max is defined Alexandre Derumier
2023-02-03 13:45 ` Fiona Ebner
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 10/13] test: add memory-max tests Alexandre Derumier
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 11/13] memory: add virtio-mem support Alexandre Derumier
2023-02-03 13:46 ` Fiona Ebner
2023-02-03 15:48 ` DERUMIER, Alexandre
2023-02-02 11:03 ` Alexandre Derumier [this message]
2023-02-02 11:03 ` [pve-devel] [PATCH v3 qemu-server 13/13] tests: add virtio-mem tests Alexandre Derumier
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=20230202110344.840195-13-aderumier@odiso.com \
--to=aderumier@odiso.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