From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3F3239260C for ; Mon, 13 Feb 2023 13:01:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CDA1A22519 for ; Mon, 13 Feb 2023 13:00:34 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 13 Feb 2023 13:00:32 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 761CC8B7F; Mon, 13 Feb 2023 13:00:23 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 74E8E179E60; Mon, 13 Feb 2023 13:00:23 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 13 Feb 2023 13:00:20 +0100 Message-Id: <20230213120021.3783742-16-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230213120021.3783742-1-aderumier@odiso.com> References: <20230213120021.3783742-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH v4 qemu-server 15/16] memory: virtio-mem : implement redispatch retry. X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2023 12:01:01 -0000 If some memory can be removed on a specific node, we try to rebalance again on other nodes Signed-off-by: Alexandre Derumier --- PVE/QemuServer/Memory.pm | 51 +++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index bf4e92a..f02b4e0 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -201,13 +201,28 @@ 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_total) = @_; - my $nb_virtiomem = scalar(keys %$virtiomems); + my $nb_virtiomem = scalar(grep { !$_->{error} } values $virtiomems->%*); print"try to balance memory on $nb_virtiomem virtiomems\n"; + die "No more available blocks in virtiomem to balance all requested memory\n" + if $target_total < 0; + die "No more available virtiomem to balance the remaining memory\n" if $nb_virtiomem == 0; + #if we can't share exactly the same amount, we add the remainder on last node my $target_aligned = int( $target_total / $nb_virtiomem / $blocksize) * $blocksize; my $target_remaining = $target_total - ($target_aligned * ($nb_virtiomem-1)); @@ -215,6 +230,7 @@ my sub balance_virtiomem { my $i = 0; foreach my $id (sort keys %$virtiomems) { my $virtiomem = $virtiomems->{$id}; + next if $virtiomem->{error}; $i++; my $virtiomem_target = $i == $nb_virtiomem ? $target_remaining : $target_aligned; $virtiomem->{completed} = 0; @@ -229,7 +245,6 @@ my sub balance_virtiomem { } my $total_finished = 0; - my $error = undef; while ($total_finished != $nb_virtiomem) { @@ -267,7 +282,6 @@ my sub balance_virtiomem { if($virtiomem->{retry} >= 5) { print "virtiomem$id: too many retry. set error\n"; $virtiomem->{error} = 1; - $error = 1; #as change is async, we don't want that value change after the api call eval { mon_cmd($vmid, 'qom-set', @@ -280,7 +294,6 @@ my sub balance_virtiomem { $virtiomem->{retry}++; } } - die "No more available blocks in virtiomem to balance all requested memory\n" if $error; } sub get_numa_node_list { @@ -388,18 +401,24 @@ sub qemu_memory_hotplug { }; } - my $target_total = $value - $static_memory; - my $err; - eval { - balance_virtiomem($vmid, $virtiomems, $blocksize, $target_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_total = $value - $static_memory - get_virtiomem_total_errors_size($virtiomems); + my $err; + eval { + balance_virtiomem($vmid, $virtiomems, $blocksize, $target_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