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 11DAD9A9F for ; Fri, 18 Nov 2022 12:32:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ED6AD37E49 for ; Fri, 18 Nov 2022 12:32:28 +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 ; Fri, 18 Nov 2022 12:32:27 +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 8369F41C0F for ; Fri, 18 Nov 2022 12:32:27 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 18 Nov 2022 12:32:22 +0100 Message-Id: <20221118113223.49305-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221118113223.49305-1-f.ebner@proxmox.com> References: <20221118113223.49305-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 =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [env.pm, pve2.pm] Subject: [pve-devel] [RFC ha-manager 2/3] env: add get_static_guest_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: Fri, 18 Nov 2022 11:32:29 -0000 which uses the efficient PVE::Cluster::get_guest_config_properties() to retrieve the information and supports caching, so the information can be passed around avoiding overhead from load_config(). Signed-off-by: Fiona Ebner --- src/PVE/HA/Env.pm | 6 ++++++ src/PVE/HA/Env/PVE2.pm | 15 +++++++++++++++ src/PVE/HA/Sim/Env.pm | 7 +++++++ 3 files changed, 28 insertions(+) diff --git a/src/PVE/HA/Env.pm b/src/PVE/HA/Env.pm index 16603ec..2b422eb 100644 --- a/src/PVE/HA/Env.pm +++ b/src/PVE/HA/Env.pm @@ -275,4 +275,10 @@ sub get_static_node_stats { return $self->{plug}->get_static_node_stats(); } +sub get_static_guest_stats { + my ($self, $cached) = @_; + + return $self->{plug}->get_static_guest_stats($cached); +} + 1; diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index f6ebfeb..02b981e 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -476,4 +476,19 @@ sub get_static_node_stats { return $stats; } +sub get_static_guest_stats { + my ($self, $cached) = @_; + + return $self->{'static-guest-stats'} if $self->{'static-guest-stats'} && $cached; + + # NOTE see get_static_stats in Resources/*.pm for what properties are required. + my $properties = ['cores', 'cpulimit', 'memory', 'sockets', 'vcpus']; + my $stats = eval { PVE::Cluster::get_guest_config_properties($properties); }; + $self->log('warning', "unable to initialize cache for static service stats - $@") if $@; + + $self->{'static-guest-stats'} = $stats; + + return $stats // {}; +} + 1; diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm index c6ea73c..51690f5 100644 --- a/src/PVE/HA/Sim/Env.pm +++ b/src/PVE/HA/Sim/Env.pm @@ -442,4 +442,11 @@ sub get_static_node_stats { return $self->{hardware}->get_static_node_stats(); } +# FIXME actually return the stats here +sub get_static_guest_stats { + my ($self, $cached) = @_; + + return {}; +} + 1; -- 2.30.2