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 7C9018E14D for ; Thu, 10 Nov 2022 15:38:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6075728ADB for ; Thu, 10 Nov 2022 15:38:16 +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, 10 Nov 2022 15:38:10 +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 01F3244BA3 for ; Thu, 10 Nov 2022 15:38:07 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 10 Nov 2022 15:37:55 +0100 Message-Id: <20221110143800.98047-17-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221110143800.98047-1-f.ebner@proxmox.com> References: <20221110143800.98047-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 Adjusted score from AWL reputation of From: address 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 Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH ha-manager 07/11] env: add get_crs_settings() 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, 10 Nov 2022 14:38:16 -0000 for reading the resource scheduler settings. Signed-off-by: Fiona Ebner --- src/PVE/HA/Env.pm | 7 +++++++ src/PVE/HA/Env/PVE2.pm | 12 ++++++++++++ src/PVE/HA/Sim/Env.pm | 9 +++++++++ 3 files changed, 28 insertions(+) diff --git a/src/PVE/HA/Env.pm b/src/PVE/HA/Env.pm index 00e3e3c..c014ff7 100644 --- a/src/PVE/HA/Env.pm +++ b/src/PVE/HA/Env.pm @@ -269,6 +269,13 @@ sub get_ha_settings { return $self->{plug}->get_ha_settings(); } +# return cluster wide resource scheduling settings +sub get_crs_settings { + my ($self) = @_; + + return $self->{plug}->get_crs_settings(); +} + sub get_static_node_stats { my ($self) = @_; diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index 7fac43c..e8f746c 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -464,6 +464,18 @@ sub get_ha_settings { return $datacenterconfig->{ha}; } +sub get_crs_settings { + my ($self) = @_; + + my $datacenterconfig = eval { cfs_read_file('datacenter.cfg') }; + if (my $err = $@) { + $self->log('err', "unable to get CRS settings from datacenter.cfg - $err"); + return {}; + } + + return $datacenterconfig->{crs}; +} + sub get_static_node_stats { my ($self) = @_; diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm index b286708..967c031 100644 --- a/src/PVE/HA/Sim/Env.pm +++ b/src/PVE/HA/Sim/Env.pm @@ -433,4 +433,13 @@ sub get_ha_settings { return $datacenterconfig->{ha}; } +# return cluster wide resource scheduling settings +sub get_crs_settings { + my ($self) = @_; + + my $datacenterconfig = $self->{hardware}->read_datacenter_conf(); + + return $datacenterconfig->{crs}; +} + 1; -- 2.30.2