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 C86DD92FD for ; Thu, 17 Nov 2022 15:00:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A7F0C2D5BB 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)) (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 579D444D7F 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:05 +0100 Message-Id: <20221117140018.105004-5-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 04/15] manager: select service node: add $sid to parameters 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:53 -0000 In preparation for scheduling based on static information, where the scoring of nodes depends on information from the service's VM/CT configuration file (and the $sid is required to query that). Signed-off-by: Fiona Ebner --- No changes from v1. src/PVE/HA/Manager.pm | 4 +++- src/test/test_failover1.pl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index 518f64f..63c94af 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -119,7 +119,7 @@ sub get_node_priority_groups { } sub select_service_node { - my ($groups, $online_node_usage, $service_conf, $current_node, $try_next, $tried_nodes, $maintenance_fallback) = @_; + my ($groups, $online_node_usage, $sid, $service_conf, $current_node, $try_next, $tried_nodes, $maintenance_fallback) = @_; my $group = get_service_group($groups, $online_node_usage, $service_conf); @@ -766,6 +766,7 @@ sub next_state_started { my $node = select_service_node( $self->{groups}, $self->{online_node_usage}, + $sid, $cd, $sd->{node}, $try_next, @@ -847,6 +848,7 @@ sub next_state_recovery { my $recovery_node = select_service_node( $self->{groups}, $self->{online_node_usage}, + $sid, $cd, $sd->{node}, ); diff --git a/src/test/test_failover1.pl b/src/test/test_failover1.pl index 67573a2..f11d1a6 100755 --- a/src/test/test_failover1.pl +++ b/src/test/test_failover1.pl @@ -30,7 +30,7 @@ sub test { my ($expected_node, $try_next) = @_; my $node = PVE::HA::Manager::select_service_node - ($groups, $online_node_usage, $service_conf, $current_node, $try_next); + ($groups, $online_node_usage, "vm:111", $service_conf, $current_node, $try_next); my (undef, undef, $line) = caller(); die "unexpected result: $node != ${expected_node} at line $line\n" -- 2.30.2