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 D75DF96CA8 for ; Tue, 16 Apr 2024 14:21:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 918221A5F8 for ; Tue, 16 Apr 2024 14:21:07 +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: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 9C5F4450BE for ; Tue, 16 Apr 2024 14:21:06 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 14:20:45 +0200 Message-Id: <20240416122054.733817-11-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 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: Tue, 16 Apr 2024 12:21:37 -0000 allow to set/update limits, and return them when querying individual pools. Signed-off-by: Fabian Grünbichler --- Notes: requires bumped pve-access-control v2: - unify run vs config limit checks into helper - avoid hard-coding resource kinds PVE/API2/Pool.pm | 50 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm index 54e744558..031f0160f 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; @@ -153,6 +154,26 @@ __PACKAGE__->register_method ({ return $res; }}); +my $check_run_vs_config_limits = sub { + my ($limits) = @_; + + my $exception; + + for my $resource (keys $limits->%*) { + next if $resource !~ m/-run$/; + + my $config = $resource; + $config =~ s/-run$/-config/; + + if (defined($limits->{$config}) && $limits->{$config} < $limits->{$resource}) { + my $msg = "run limit must be below config limit!"; + $exception->{$resource} = $msg; + } + } + + raise_param_exc($exception) if $exception; +}; + __PACKAGE__->register_method ({ name => 'create_pool', protected => 1, @@ -173,6 +194,7 @@ __PACKAGE__->register_method ({ type => 'string', optional => 1, }, + limits => get_standard_option('pve-pool-limits'), }, }, returns => { type => 'null' }, @@ -196,6 +218,10 @@ __PACKAGE__->register_method ({ }; $usercfg->{pools}->{$pool}->{comment} = $param->{comment} if $param->{comment}; + if (my $limits = parse_property_string('pve-pool-limits', $param->{limits} // '')) { + $check_run_vs_config_limits->($limits); + $usercfg->{pools}->{$pool}->{limits} = $limits; + } cfs_write_file("user.cfg", $usercfg); }, "create pool failed"); @@ -288,6 +314,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 +375,18 @@ __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}; + } + } + $check_run_vs_config_limits->($limits); + } + cfs_write_file("user.cfg", $usercfg); }, "update pools failed"); @@ -409,6 +450,7 @@ __PACKAGE__->register_method ({ }, }, }, + limits => get_standard_option("pve-pool-limits"), }, }, code => sub { -- 2.39.2