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 C08CE934A 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 6A8B52D645 for ; Thu, 17 Nov 2022 15:00:26 +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:23 +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 2F40444D86 for ; Thu, 17 Nov 2022 15:00:23 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 17 Nov 2022 15:00:08 +0100 Message-Id: <20221117140018.105004-8-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 07/15] env: rename get_ha_settings to get_datacenter_settings 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 The method will be extended to include other HA-relevant settings from datacenter.cfg. Suggested-by: Thomas Lamprecht Signed-off-by: Fiona Ebner --- New in v2. src/PVE/HA/Env.pm | 4 ++-- src/PVE/HA/Env/PVE2.pm | 2 +- src/PVE/HA/LRM.pm | 2 +- src/PVE/HA/Sim/Env.pm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PVE/HA/Env.pm b/src/PVE/HA/Env.pm index 00e3e3c..16603ec 100644 --- a/src/PVE/HA/Env.pm +++ b/src/PVE/HA/Env.pm @@ -263,10 +263,10 @@ sub get_max_workers { } # return cluster wide enforced HA settings -sub get_ha_settings { +sub get_datacenter_settings { my ($self) = @_; - return $self->{plug}->get_ha_settings(); + return $self->{plug}->get_datacenter_settings(); } sub get_static_node_stats { diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index 7fac43c..d2c46e8 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -452,7 +452,7 @@ sub get_max_workers { } # return cluster wide enforced HA settings -sub get_ha_settings { +sub get_datacenter_settings { my ($self) = @_; my $datacenterconfig = eval { cfs_read_file('datacenter.cfg') }; diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm index 8cbdb82..7750f4d 100644 --- a/src/PVE/HA/LRM.pm +++ b/src/PVE/HA/LRM.pm @@ -59,7 +59,7 @@ sub shutdown_request { my ($shutdown, $reboot) = $haenv->is_node_shutdown(); - my $dc_ha_cfg = $haenv->get_ha_settings(); + my $dc_ha_cfg = $haenv->get_datacenter_settings(); my $shutdown_policy = $dc_ha_cfg->{shutdown_policy} // 'conditional'; if ($shutdown) { # don't log this on service restart, only on node shutdown diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm index 6bd35b3..6c47030 100644 --- a/src/PVE/HA/Sim/Env.pm +++ b/src/PVE/HA/Sim/Env.pm @@ -425,7 +425,7 @@ sub get_max_workers { } # return cluster wide enforced HA settings -sub get_ha_settings { +sub get_datacenter_settings { my ($self) = @_; my $datacenterconfig = $self->{hardware}->read_datacenter_conf(); -- 2.30.2