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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 88B219303 for ; Thu, 17 Nov 2022 15:00:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 710662D5AC for ; Thu, 17 Nov 2022 15:00:23 +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) server-digest SHA256) (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 29A7844945 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:02 +0100 Message-Id: <20221117140018.105004-2-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 01/15] env: add get_static_node_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:23 -0000 to be used for static resource scheduling. In the simulation environment, the information can be added in hardware_status. Signed-off-by: Fiona Ebner --- Changes from v1: * Properly add it to the simulation environment. src/PVE/HA/Env.pm | 6 ++++++ src/PVE/HA/Env/PVE2.pm | 13 +++++++++++++ src/PVE/HA/Sim/Env.pm | 6 ++++++ src/PVE/HA/Sim/Hardware.pm | 13 +++++++++++++ 4 files changed, 38 insertions(+) diff --git a/src/PVE/HA/Env.pm b/src/PVE/HA/Env.pm index ac569a9..00e3e3c 100644 --- a/src/PVE/HA/Env.pm +++ b/src/PVE/HA/Env.pm @@ -269,4 +269,10 @@ sub get_ha_settings { return $self->{plug}->get_ha_settings(); } +sub get_static_node_stats { + my ($self) = @_; + + return $self->{plug}->get_static_node_stats(); +} + 1; diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index 5e0a683..7cecf35 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -5,6 +5,7 @@ use warnings; use POSIX qw(:errno_h :fcntl_h); use IO::File; use IO::Socket::UNIX; +use JSON; use PVE::SafeSyslog; use PVE::Tools; @@ -459,4 +460,16 @@ sub get_ha_settings { return $datacenterconfig->{ha}; } +sub get_static_node_stats { + my ($self) = @_; + + my $stats = PVE::Cluster::get_node_kv('static-info'); + for my $node (keys $stats->%*) { + $stats->{$node} = eval { decode_json($stats->{$node}) }; + $self->log('err', "unable to decode static node info for '$node' - $@") if $@; + } + + return $stats; +} + 1; diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm index b286708..6bd35b3 100644 --- a/src/PVE/HA/Sim/Env.pm +++ b/src/PVE/HA/Sim/Env.pm @@ -433,4 +433,10 @@ sub get_ha_settings { return $datacenterconfig->{ha}; } +sub get_static_node_stats { + my ($self) = @_; + + return $self->{hardware}->get_static_node_stats(); +} + 1; diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm index 96a4064..e38561a 100644 --- a/src/PVE/HA/Sim/Hardware.pm +++ b/src/PVE/HA/Sim/Hardware.pm @@ -858,4 +858,17 @@ sub watchdog_update { return &$modify_watchog($self, $code); } +sub get_static_node_stats { + my ($self) = @_; + + my $cstatus = $self->read_hardware_status_nolock(); + + my $stats = {}; + for my $node (keys $cstatus->%*) { + $stats->{$node} = { $cstatus->{$node}->%{qw(cpus memory)} }; + } + + return $stats; +} + 1; -- 2.30.2