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 AA69494631 for ; Wed, 10 Apr 2024 15:14:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A914610652 for ; Wed, 10 Apr 2024 15:13:36 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 ; Wed, 10 Apr 2024 15:13:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9114B43B1D for ; Wed, 10 Apr 2024 15:13:35 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 15:13:14 +0200 Message-Id: <20240410131316.1208679-18-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410131316.1208679-1-f.gruenbichler@proxmox.com> References: <20240410131316.1208679-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.057 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server 4/6] update/hotplug: handle pool limits 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: Wed, 10 Apr 2024 13:14:07 -0000 if the new value is higher than the old one, check against limits. if the old one is higher, then the change is always okay, to support reducing the usage in steps spread over multiple guests.. Signed-off-by: Fabian Grünbichler --- PVE/API2/Qemu.pm | 22 ++++++++++++++++++++++ PVE/QemuServer.pm | 7 +++++++ PVE/QemuServer/Memory.pm | 6 ++++++ 3 files changed, 35 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 078a487e..6f104faa 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -1860,6 +1860,28 @@ my $update_vm_api = sub { } }; + # check pool limits, but only if values increase, ignoring + # deletions and pending values + my $usage = PVE::QemuConfig->get_pool_usage($conf); + if (defined($param->{sockets}) || defined($param->{cores})) { + my $old = $usage->{cpu}; + my $new = $param->{sockets} || $usage->{sockets}; + $new *= ($param->{cores} || $usage->{cores}); + + if ($new > $old) { + my $change = { cpu => $new - $old }; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $change); + } + } elsif (defined($param->{memory})) { + my $old = $usage->{mem}; + my $new = PVE::QemuServer::Memory::get_current_memory($param->{memory})*1024*1024; + + if ($new > $old) { + my $change = { mem => $new - $old }; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $change); + } + } + foreach my $opt (@delete) { $modified->{$opt} = 1; $conf = PVE::QemuConfig->load_config($vmid); # update/reload diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 96652abe..4acf2fe1 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4610,6 +4610,13 @@ sub qemu_cpu_hotplug { } return; + } else { + my $changes = { + absolute => 1, + running => 1, + cpu => $vcpus, + }; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $changes); } my $currentrunningvcpus = mon_cmd($vmid, "query-cpus-fast"); diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index f365f2d1..b27b8b2b 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -234,6 +234,12 @@ sub qemu_memory_hotplug { die "you cannot add more memory than max mem $MAX_MEM MB!\n" if $value > $MAX_MEM; if ($value > $memory) { + my $changes = { + absolute => 1, + running => 1, + mem => $memory - $value, + }; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $changes); my $numa_hostmap; -- 2.39.2