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 1E6BB94B9A for ; Thu, 11 Apr 2024 11:24:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EA8DC1DA4B for ; Thu, 11 Apr 2024 11:24:06 +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 ; Thu, 11 Apr 2024 11:24:06 +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 0E418449E4 for ; Thu, 11 Apr 2024 11:24:06 +0200 (CEST) Date: Thu, 11 Apr 2024 11:24:04 +0200 From: Wolfgang Bumiller To: Fabian =?utf-8?Q?Gr=C3=BCnbichler?= Cc: pve-devel@lists.proxmox.com Message-ID: <3ycjoufdmc2vds3rysuoyvguxz3llmdu77esvkejzkuneum2uw@7rhkj22n672a> References: <20240410131316.1208679-1-f.gruenbichler@proxmox.com> <20240410131316.1208679-11-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240410131316.1208679-11-f.gruenbichler@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.086 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pool.pm] Subject: Re: [pve-devel] [PATCH manager 1/4] api: pools: add limits management 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: Thu, 11 Apr 2024 09:24:37 -0000 On Wed, Apr 10, 2024 at 03:13:07PM +0200, Fabian Grünbichler wrote: > allow to set/update limits, and return them when querying individual pools. > > Signed-off-by: Fabian Grünbichler > --- > > Notes: > requires bumped pve-access-control > > PVE/API2/Pool.pm | 36 ++++++++++++++++++++++++++++++++---- > 1 file changed, 32 insertions(+), 4 deletions(-) > > diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm > index 54e744558..26ff7742e 100644 > --- a/PVE/API2/Pool.pm > +++ b/PVE/API2/Pool.pm > @@ -7,6 +7,7 @@ use PVE::AccessControl; > use PVE::Cluster qw (cfs_read_file cfs_write_file); > use PVE::Exception qw(raise_param_exc); > use PVE::INotify; > +use PVE::JSONSchema qw(get_standard_option parse_property_string print_property_string); > use PVE::Storage; > > use PVE::SafeSyslog; > @@ -47,10 +48,7 @@ __PACKAGE__->register_method ({ > type => "object", > properties => { > poolid => { type => 'string' }, > - comment => { > - type => 'string', > - optional => 1, > - }, > + comment => { type => 'string', optional => 1 }, > members => { > type => 'array', > optional => 1, > @@ -79,6 +77,7 @@ __PACKAGE__->register_method ({ > }, > }, > }, > + limits => { type => 'string', optional => 1 }, > }, > }, > links => [ { rel => 'child', href => "{poolid}" } ], > @@ -136,6 +135,8 @@ __PACKAGE__->register_method ({ > members => $members, > }; > $pool_info->{comment} = $pool_config->{comment} if defined($pool_config->{comment}); > + $pool_info->{limits} = print_property_string($pool_config->{limits}, 'pve-pool-limits') > + if defined($pool_config->{limits}); > $pool_info->{poolid} = $poolid; > > push @$res, $pool_info; > @@ -173,6 +174,7 @@ __PACKAGE__->register_method ({ > type => 'string', > optional => 1, > }, > + limits => get_standard_option('pve-pool-limits'), > }, > }, > returns => { type => 'null' }, > @@ -196,6 +198,13 @@ __PACKAGE__->register_method ({ > }; > > $usercfg->{pools}->{$pool}->{comment} = $param->{comment} if $param->{comment}; > + if (my $limits = parse_property_string('pve-pool-limits', $param->{limits} // '')) { > + for my $kind (qw(mem cpu disk)) { Like mentioned in the guest-helpers, this could itearte over the keys exposed via access-control, or `keys %$limits` and deal with the `-run`/`-config` suffixes. > + raise_param_exc({ "$kind-run" => "'$kind-run' limit must be below '$kind-config' limit if both are defined!" }) > + if defined($limits->{"$kind-run"}) && defined($limits->{"$kind-config"}) && $limits->{"$kind-config"} < $limits->{"$kind-run"}; > + } > + $usercfg->{pools}->{$pool}->{limits} = $limits; > + } > > cfs_write_file("user.cfg", $usercfg); > }, "create pool failed"); > @@ -288,6 +297,9 @@ __PACKAGE__->register_method ({ > optional => 1, > default => 0, > }, > + limits => get_standard_option("pve-pool-limits", { > + description => "Update pool limits. Passing '0' for a specific limit will remove any currently configured value.", > + }), > }, > }, > returns => { type => 'null' }, > @@ -346,6 +358,21 @@ __PACKAGE__->register_method ({ > } > } > > + if (my $update = parse_property_string('pve-pool-limits', $param->{limits} // '')) { > + my $limits = $pool_config->{limits}; > + for my $kind (sort keys $update->%*) { > + if ($update->{$kind} == 0) { > + delete $limits->{$kind}; > + } else { > + $limits->{$kind} = $update->{$kind}; > + } > + } > + for my $kind (qw(mem cpu disk)) { > + raise_param_exc( { "$kind-run" => "'$kind-run' limit must be below '$kind-config' limit if both are defined!" }) > + if defined($limits->{"$kind-run"}) && defined($limits->{"$kind-config"}) && $limits->{"$kind-config"} < $limits->{"$kind-run"}; > + } ^ should probably be factored out, since it exists twice and is quite unwieldy ;-) > + } > + > cfs_write_file("user.cfg", $usercfg); > }, "update pools failed"); > > @@ -409,6 +436,7 @@ __PACKAGE__->register_method ({ > }, > }, > }, > + limits => get_standard_option("pve-pool-limits"), > }, > }, > code => sub { > -- > 2.39.2