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 <f.gruenbich...@proxmox.com>
> ---
>
> 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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
