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 811359B25 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 6A50A37E4C for ; Fri, 18 Nov 2022 12:32:29 +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:28 +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 B960B44D13 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:23 +0100 Message-Id: <20221118113223.49305-4-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. [manager.pm, pvevm.pm, static.pm, pvect.pm] Subject: [pve-devel] [RFC ha-manager 3/3] manager/usage: cache static service stats to avoid overhead 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 Benchmarked recompute_online_node_usage() again with ~300 HA services (minimal containers) running on my virtual test cluster. Timings before this patch were between 0.007 - 0.016 seconds Timings after this patch were between 0.0035 - 0.006 seconds So only about twice as fast unfortunately. Reducing the number of recompute_online_node_usage() calls might be necessary after all. Signed-off-by: Fiona Ebner --- src/PVE/HA/Manager.pm | 1 + src/PVE/HA/Resources/PVECT.pm | 1 + src/PVE/HA/Resources/PVEVM.pm | 1 + src/PVE/HA/Usage/Static.pm | 13 ++++++++++--- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index 69bfbc3..c9a9f14 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -447,6 +447,7 @@ sub manage { for (;;) { my $repeat = 0; + $haenv->get_static_guest_stats(); # to cache the info $self->recompute_online_node_usage(); foreach my $sid (sort keys %$ss) { diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm index c10d024..4c295f3 100644 --- a/src/PVE/HA/Resources/PVECT.pm +++ b/src/PVE/HA/Resources/PVECT.pm @@ -155,6 +155,7 @@ sub remove_locks { sub get_static_stats { my ($class, $haenv, $id, $service_node, $cache) = @_; + # NOTE that cache might not contain the full config my $conf = $cache->{$id} ||= PVE::LXC::Config->load_config($id, $service_node); return { diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm index ca7fbc4..b6234be 100644 --- a/src/PVE/HA/Resources/PVEVM.pm +++ b/src/PVE/HA/Resources/PVEVM.pm @@ -178,6 +178,7 @@ sub remove_locks { sub get_static_stats { my ($class, $haenv, $id, $service_node, $cache) = @_; + # NOTE that cache might not contain the full config my $conf = $cache->{$id} ||= PVE::QemuConfig->load_config($id, $service_node); my $defaults = PVE::QemuServer::load_defaults(); diff --git a/src/PVE/HA/Usage/Static.pm b/src/PVE/HA/Usage/Static.pm index 73ce836..05b876d 100644 --- a/src/PVE/HA/Usage/Static.pm +++ b/src/PVE/HA/Usage/Static.pm @@ -20,6 +20,7 @@ sub new { return bless { 'node-stats' => $node_stats, 'service-stats' => {}, + 'service-stats-cache' => $haenv->get_static_guest_stats(1), haenv => $haenv, scheduler => $scheduler, 'service-counts' => {}, # Service count on each node. Fallback if scoring calculation fails. @@ -65,13 +66,19 @@ my sub get_service_usage { return $self->{'service-stats'}->{$sid} if $self->{'service-stats'}->{$sid}; - my (undef, $type, $id) = $self->{haenv}->parse_sid($sid); + my $haenv = $self->{haenv}; + + my (undef, $type, $id) = $haenv->parse_sid($sid); my $plugin = PVE::HA::Resources->lookup($type); - my $stats = eval { $plugin->get_static_stats($self->{haenv}, $id, $service_node); }; + my $stats = eval { + $plugin->get_static_stats($haenv, $id, $service_node, $self->{'service-stats-cache'}); + }; if (my $err = $@) { # config might've already moved during a migration - $stats = eval { $plugin->get_static_stats($self->{haenv}, $id, $migration_target); } if $migration_target; + if ($migration_target) { + $stats = eval { $plugin->get_static_stats($haenv, $id, $migration_target); }; + } die "did not get static service usage information for '$sid' - $err\n" if !$stats; } -- 2.30.2