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 35F49931E for ; Thu, 17 Nov 2022 15:00:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7C24A2D678 for ; Thu, 17 Nov 2022 15:00:30 +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:26 +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 CA14D44D97 for ; Thu, 17 Nov 2022 15:00:24 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 17 Nov 2022 15:00:04 +0100 Message-Id: <20221117140018.105004-4-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 03/15] add Usage base plugin and Usage::Basic plugin 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:55 -0000 in preparation to also support static resource scheduling via another such Usage plugin. The interface is designed in anticipation of the Usage::Static plugin, the Usage::Basic plugin doesn't require all parameters. In Usage::Static, the $haenv will necessary for logging and getting the static node stats. add_service_usage_to_node() and score_nodes_to_start_service() take the sid, service node and the former also the optional migration target (during a migration it's not clear whether the config file has already been moved or not) to be able to get the static service stats. Signed-off-by: Fiona Ebner --- No changes from v1. debian/pve-ha-manager.install | 2 ++ src/PVE/HA/Makefile | 3 +- src/PVE/HA/Usage.pm | 49 +++++++++++++++++++++++++++++++++ src/PVE/HA/Usage/Basic.pm | 52 +++++++++++++++++++++++++++++++++++ src/PVE/HA/Usage/Makefile | 6 ++++ 5 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 src/PVE/HA/Usage.pm create mode 100644 src/PVE/HA/Usage/Basic.pm create mode 100644 src/PVE/HA/Usage/Makefile diff --git a/debian/pve-ha-manager.install b/debian/pve-ha-manager.install index 33a5c58..87fb24c 100644 --- a/debian/pve-ha-manager.install +++ b/debian/pve-ha-manager.install @@ -33,5 +33,7 @@ /usr/share/perl5/PVE/HA/Resources/PVECT.pm /usr/share/perl5/PVE/HA/Resources/PVEVM.pm /usr/share/perl5/PVE/HA/Tools.pm +/usr/share/perl5/PVE/HA/Usage.pm +/usr/share/perl5/PVE/HA/Usage/Basic.pm /usr/share/perl5/PVE/Service/pve_ha_crm.pm /usr/share/perl5/PVE/Service/pve_ha_lrm.pm diff --git a/src/PVE/HA/Makefile b/src/PVE/HA/Makefile index c366f6c..8c91b97 100644 --- a/src/PVE/HA/Makefile +++ b/src/PVE/HA/Makefile @@ -1,5 +1,5 @@ SIM_SOURCES=CRM.pm Env.pm Groups.pm Resources.pm LRM.pm Manager.pm \ - NodeStatus.pm Tools.pm FenceConfig.pm Fence.pm + NodeStatus.pm Tools.pm FenceConfig.pm Fence.pm Usage.pm SOURCES=${SIM_SOURCES} Config.pm @@ -8,6 +8,7 @@ install: install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/HA for i in ${SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/HA/$$i; done make -C Resources install + make -C Usage install make -C Env install .PHONY: installsim diff --git a/src/PVE/HA/Usage.pm b/src/PVE/HA/Usage.pm new file mode 100644 index 0000000..4c723d1 --- /dev/null +++ b/src/PVE/HA/Usage.pm @@ -0,0 +1,49 @@ +package PVE::HA::Usage; + +use strict; +use warnings; + +sub new { + my ($class, $haenv) = @_; + + die "implement in subclass"; +} + +sub add_node { + my ($self, $nodename) = @_; + + die "implement in subclass"; +} + +sub remove_node { + my ($self, $nodename) = @_; + + die "implement in subclass"; +} + +sub list_nodes { + my ($self) = @_; + + die "implement in subclass"; +} + +sub contains_node { + my ($self, $nodename) = @_; + + die "implement in subclass"; +} + +sub add_service_usage_to_node { + my ($self, $nodename, $sid, $service_node, $migration_target) = @_; + + die "implement in subclass"; +} + +# Returns a hash with $nodename => $score pairs. A lower $score is better. +sub score_nodes_to_start_service { + my ($self, $sid, $service_node) = @_; + + die "implement in subclass"; +} + +1; diff --git a/src/PVE/HA/Usage/Basic.pm b/src/PVE/HA/Usage/Basic.pm new file mode 100644 index 0000000..f066350 --- /dev/null +++ b/src/PVE/HA/Usage/Basic.pm @@ -0,0 +1,52 @@ +package PVE::HA::Usage::Basic; + +use strict; +use warnings; + +use base qw(PVE::HA::Usage); + +sub new { + my ($class, $haenv) = @_; + + return bless { + nodes => {}, + }, $class; +} + +sub add_node { + my ($self, $nodename) = @_; + + $self->{nodes}->{$nodename} = 0; +} + +sub remove_node { + my ($self, $nodename) = @_; + + delete $self->{nodes}->{$nodename}; +} + +sub list_nodes { + my ($self) = @_; + + return keys $self->{nodes}->%*; +} + +sub contains_node { + my ($self, $nodename) = @_; + + return defined($self->{nodes}->{$nodename}); +} + +sub add_service_usage_to_node { + my ($self, $nodename, $sid, $service_node, $migration_target) = @_; + + $self->{nodes}->{$nodename}++; +} + +sub score_nodes_to_start_service { + my ($self, $sid, $service_node) = @_; + + return $self->{nodes}; +} + +1; diff --git a/src/PVE/HA/Usage/Makefile b/src/PVE/HA/Usage/Makefile new file mode 100644 index 0000000..ccf1282 --- /dev/null +++ b/src/PVE/HA/Usage/Makefile @@ -0,0 +1,6 @@ +SOURCES=Basic.pm + +.PHONY: install +install: + install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/HA/Usage + for i in ${SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/HA/Usage/$$i; done -- 2.30.2