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 34BF196D36 for ; Tue, 16 Apr 2024 14:21:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2EC0B1A824 for ; Tue, 16 Apr 2024 14:21:13 +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 ; Tue, 16 Apr 2024 14:21:12 +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 8B44C450BE for ; Tue, 16 Apr 2024 14:21:12 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 14:20:51 +0200 Message-Id: <20240416122054.733817-17-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240416122054.733817-1-f.gruenbichler@proxmox.com> References: <20240416122054.733817-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.056 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 v2 qemu-server 3/6] create/restore/clone: 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: Tue, 16 Apr 2024 12:21:44 -0000 as early as possible, to avoid having to undo expensive work or allowing a window for limit exhaustion.. Signed-off-by: Fabian Grünbichler --- PVE/API2/Qemu.pm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 78f2236c..f0ff785c 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -229,6 +229,26 @@ my $check_storage_access_migrate = sub { if !$scfg->{content}->{images}; }; +my $check_pool_limits_create = sub { + my ($vmid, $conf, $running, $pool) = @_; + if ($pool) { + my $usage = PVE::QemuConfig->get_pool_usage($conf); + my $changes = { + cpu => $usage->{cpu}, + mem => $usage->{mem}, + absolute => 1, # in case this is an in-place restore + }; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $changes, $pool); + if ($running) { + $changes->{running} = 1; + $changes->{cpu} = $conf->{vcpus} + if $conf->{vcpus} && $conf->{vcpus} < $changes->{cpu}; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $changes, $pool); + } + } +}; + + my $import_from_volid = sub { my ($storecfg, $src_volid, $dest_info, $vollist) = @_; @@ -1041,6 +1061,7 @@ __PACKAGE__->register_method({ warn "Skipping early checks!\n"; } else { PVE::QemuServer::check_restore_permissions($rpcenv, $authuser, $merged); + $check_pool_limits_create->($vmid, $merged, $live_restore || $start_after_create, $pool); } } if ($archive->{type} eq 'file' || $archive->{type} eq 'pipe') { @@ -1085,6 +1106,7 @@ __PACKAGE__->register_method({ my $realcmd = sub { my $conf = $param; + $check_pool_limits_create->($vmid, $conf, $live_restore || $start_after_create, $pool); my $arch = PVE::QemuServer::get_vm_arch($conf); for my $opt (sort keys $param->%*) { @@ -3793,6 +3815,8 @@ __PACKAGE__->register_method({ my ($conffile, $newconf, $oldconf, $vollist, $drives, $fullclone) = $load_and_check->(); my $storecfg = PVE::Storage::config(); + $check_pool_limits_create->($newid, $newconf, 0, $pool); + # auto generate a new uuid my $smbios1 = PVE::QemuServer::parse_smbios1($newconf->{smbios1} || ''); $smbios1->{uuid} = PVE::QemuServer::generate_uuid(); -- 2.39.2