From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 6AC551FF16B for ; Tue, 9 Sep 2025 10:36:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D90982857; Tue, 9 Sep 2025 10:35:54 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Tue, 9 Sep 2025 10:33:54 +0200 Message-ID: <20250909083539.39675-18-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250909083539.39675-1-d.kral@proxmox.com> References: <20250909083539.39675-1-d.kral@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1757406921087 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 v2 17/18] manager: group migration: sync active service counting with lrm's helper 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" There are some inconsistencies between the HA group migration's is_lrm_active_or_idle helper's and the LRM's active_service_count(...) helper's counting of active services. Sync these by: - Counting a migrating service as active on both the source and target node's LRM as has been introduced in commit a94a38f9 ("LRM: count incoming migrations towards a nodes active resources"). - Not counting services as active if these are in error or request_start state as has been introduced in commit 38545741 ("LRM: do not count erroneous service as active") and commit 4931b586 ("manager: add new intermediate state for stop->start transitions") respectively. - Removing the `sort` as sorting the services is not required for counting active services. Signed-off-by: Daniel Kral --- changes since v1: - remove sort as it's not needed src/PVE/HA/Manager.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index 2e67c646..4cdddb55 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -542,13 +542,16 @@ my $is_lrm_active_or_idle = sub { my ($ss, $node, $lrm_state) = @_; my $active_count = 0; - for my $sid (sort keys %$ss) { + for my $sid (keys %$ss) { my $sd = $ss->{$sid}; - next if $sd->{node} ne $node; + my $target = $sd->{target}; # count as active if we are the target. + next if (!$sd->{node} || $sd->{node} ne $node) && (!$target || $target ne $node); my $req_state = $sd->{state}; next if !defined($req_state); next if $req_state eq 'stopped'; next if $req_state eq 'freeze'; + next if $req_state eq 'error'; + next if $req_state eq 'request_start'; $active_count++; } -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel