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 63C8D93AA for ; Thu, 17 Nov 2022 15:00:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BDD2D2D61B for ; Thu, 17 Nov 2022 15:00:25 +0100 (CET) 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, 17 Nov 2022 15:00:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 83F6144D82 for ; Thu, 17 Nov 2022 15:00:22 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 17 Nov 2022 15:00:03 +0100 Message-Id: <20221117140018.105004-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221117140018.105004-1-f.ebner@proxmox.com> References: <20221117140018.105004-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.027 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 ha-manager 02/15] resources: add get_static_stats() method 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, 17 Nov 2022 14:00:57 -0000 to be used for static resource scheduling. In container's vmstatus(), the 'cores' option takes precedence over the 'cpulimit' one, but it felt more accurate to prefer 'cpulimit' here. Signed-off-by: Fiona Ebner --- Changes from v1: * Properly add it to the simulation environment. src/PVE/HA/Resources.pm | 5 +++++ src/PVE/HA/Resources/PVECT.pm | 11 +++++++++++ src/PVE/HA/Resources/PVEVM.pm | 14 ++++++++++++++ src/PVE/HA/Sim/Hardware.pm | 15 +++++++++++++++ src/PVE/HA/Sim/Resources.pm | 10 ++++++++++ 5 files changed, 55 insertions(+) diff --git a/src/PVE/HA/Resources.pm b/src/PVE/HA/Resources.pm index 835c314..7ba90f6 100644 --- a/src/PVE/HA/Resources.pm +++ b/src/PVE/HA/Resources.pm @@ -161,6 +161,11 @@ sub remove_locks { die "implement in subclass"; } +sub get_static_stats { + my ($class, $haenv, $id, $service_node) = @_; + + die "implement in subclass"; +} # package PVE::HA::Resources::IPAddr; diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm index 015faf3..4c9530d 100644 --- a/src/PVE/HA/Resources/PVECT.pm +++ b/src/PVE/HA/Resources/PVECT.pm @@ -150,4 +150,15 @@ sub remove_locks { return undef; } +sub get_static_stats { + my ($class, $haenv, $id, $service_node) = @_; + + my $conf = PVE::LXC::Config->load_config($id, $service_node); + + return { + maxcpu => $conf->{cpulimit} || $conf->{cores} || 0, + maxmem => ($conf->{memory} || 512) * 1024 * 1024, + }; +} + 1; diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm index 58c83e0..49e4a1d 100644 --- a/src/PVE/HA/Resources/PVEVM.pm +++ b/src/PVE/HA/Resources/PVEVM.pm @@ -173,4 +173,18 @@ sub remove_locks { return undef; } +sub get_static_stats { + my ($class, $haenv, $id, $service_node) = @_; + + my $conf = PVE::QemuConfig->load_config($id, $service_node); + my $defaults = PVE::QemuServer::load_defaults(); + + my $cpus = ($conf->{sockets} || $defaults->{sockets}) * ($conf->{cores} || $defaults->{cores}); + + return { + maxcpu => $conf->{vcpus} || $cpus, + maxmem => ($conf->{memory} || $defaults->{memory}) * 1024 * 1024, + }; +} + 1; diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm index e38561a..e33a4c5 100644 --- a/src/PVE/HA/Sim/Hardware.pm +++ b/src/PVE/HA/Sim/Hardware.pm @@ -29,6 +29,7 @@ my $watchdog_timeout = 60; # $testdir/hardware_status Hardware description (number of nodes, ...) # $testdir/manager_status CRM status (start with {}) # $testdir/service_config Service configuration +# $testdir/static_service_stats Static service usage information (cpu, memory) # $testdir/groups HA groups configuration # $testdir/service_status_ Service status # $testdir/datacenter.cfg Datacenter wide HA configuration @@ -38,6 +39,7 @@ my $watchdog_timeout = 60; # # $testdir/status/cluster_locks Cluster locks # $testdir/status/hardware_status Hardware status (power/network on/off) +# $testdir/status/static_service_stats Static service usage information (cpu, memory) # $testdir/status/watchdog_status Watchdog status # # runtime status @@ -330,6 +332,15 @@ sub write_service_status { return $res; } +sub read_static_service_stats { + my ($self) = @_; + + my $filename = "$self->{statusdir}/static_service_stats"; + my $stats = PVE::HA::Tools::read_json_from_file($filename); + + return $stats; +} + my $default_group_config = <<__EOD; group: prefer_node1 nodes node1 @@ -404,6 +415,10 @@ sub new { copy("$testdir/datacenter.cfg", "$statusdir/datacenter.cfg"); } + if (-f "$testdir/static_service_stats") { + copy("$testdir/static_service_stats", "$statusdir/static_service_stats"); + } + my $cstatus = $self->read_hardware_status_nolock(); foreach my $node (sort keys %$cstatus) { diff --git a/src/PVE/HA/Sim/Resources.pm b/src/PVE/HA/Sim/Resources.pm index bccc0e6..e6e1853 100644 --- a/src/PVE/HA/Sim/Resources.pm +++ b/src/PVE/HA/Sim/Resources.pm @@ -139,4 +139,14 @@ sub remove_locks { return undef; } +sub get_static_stats { + my ($class, $haenv, $id, $service_node) = @_; + + my $sid = $class->type() . ":$id"; + my $hardware = $haenv->hardware(); + + my $stats = $hardware->read_static_service_stats(); + return $stats->{$sid}; +} + 1; -- 2.30.2