From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id CC43A1FF0BC for ; Thu, 15 Oct 2026 14:51:28 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 83F7A215F0; Thu, 15 Oct 2026 14:51:21 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v4 04/27] update crm commands: align logging with next state started/stopped Date: Thu, 15 Oct 2026 14:50:38 +0200 Message-ID: <20261015125112.174954-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261015125112.174954-1-f.ebner@proxmox.com> References: <20261015125112.174954-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1792068676359 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.422 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: IAOBWDSDQYBEISVYV6MLINGL353M5KBJ X-Message-ID-Hash: IAOBWDSDQYBEISVYV6MLINGL353M5KBJ X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: In preparation to factor out a common helper for checking whether a resource motion is valid. Signed-off-by: Fiona Ebner --- New in v4. src/PVE/HA/Manager.pm | 4 ++-- src/test/test-node-affinity-nonstrict7/log.expect | 2 +- src/test/test-node-affinity-strict7/log.expect | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index 5840a76..0aef118 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -681,12 +681,12 @@ sub update_crm_commands { my ($task, $sid, $node) = ($1, $2, $3); if (my $sd = $ss->{$sid}) { if (!$ns->node_is_online($node)) { - $haenv->log('err', "crm command error - node not online: $cmd"); + $haenv->log('err', "ignore crm command '$cmd' - node '$node' not online"); } else { if ($node eq $sd->{node}) { $haenv->log( 'info', - "ignore crm command - service already on target node: $cmd", + "ignore crm command '$cmd' - service already on node '$node'", ); } else { $self->queue_resource_motion($cmd, $task, $sid, $node); diff --git a/src/test/test-node-affinity-nonstrict7/log.expect b/src/test/test-node-affinity-nonstrict7/log.expect index 54e824e..fe9423b 100644 --- a/src/test/test-node-affinity-nonstrict7/log.expect +++ b/src/test/test-node-affinity-nonstrict7/log.expect @@ -32,7 +32,7 @@ err 120 node1/crm: crm command 'migrate vm:101 node1' error - service 'vm info 220 cmdlist: execute service vm:101 migrate node2 err 220 node1/crm: crm command 'migrate vm:101 node2' error - service 'vm:101' is not allowed on node 'node2' info 320 cmdlist: execute service vm:101 migrate node3 -info 320 node1/crm: ignore crm command - service already on target node: migrate vm:101 node3 +info 320 node1/crm: ignore crm command 'migrate vm:101 node3' - service already on node 'node3' info 420 cmdlist: execute service vm:102 migrate node3 info 420 node1/crm: got crm command: migrate vm:102 node3 info 420 node1/crm: migrate service 'vm:102' to node 'node3' diff --git a/src/test/test-node-affinity-strict7/log.expect b/src/test/test-node-affinity-strict7/log.expect index ae8e43f..21cfb76 100644 --- a/src/test/test-node-affinity-strict7/log.expect +++ b/src/test/test-node-affinity-strict7/log.expect @@ -32,11 +32,11 @@ err 120 node1/crm: crm command 'migrate vm:101 node1' error - service 'vm info 220 cmdlist: execute service vm:101 migrate node2 err 220 node1/crm: crm command 'migrate vm:101 node2' error - service 'vm:101' is not allowed on node 'node2' info 320 cmdlist: execute service vm:101 migrate node3 -info 320 node1/crm: ignore crm command - service already on target node: migrate vm:101 node3 +info 320 node1/crm: ignore crm command 'migrate vm:101 node3' - service already on node 'node3' info 420 cmdlist: execute service vm:102 migrate node3 err 420 node1/crm: crm command 'migrate vm:102 node3' error - service 'vm:102' is not allowed on node 'node3' info 520 cmdlist: execute service vm:102 migrate node2 -info 520 node1/crm: ignore crm command - service already on target node: migrate vm:102 node2 +info 520 node1/crm: ignore crm command 'migrate vm:102 node2' - service already on node 'node2' info 620 cmdlist: execute service vm:102 migrate node1 info 620 node1/crm: got crm command: migrate vm:102 node1 info 620 node1/crm: migrate service 'vm:102' to node 'node1' -- 2.47.3