public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
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	[thread overview]
Message-ID: <20261015125112.174954-5-f.ebner@proxmox.com> (raw)
In-Reply-To: <20261015125112.174954-1-f.ebner@proxmox.com>

In preparation to factor out a common helper for checking whether a
resource motion is valid.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

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





  parent reply	other threads:[~2026-10-15 12:51 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-15 12:50 [PATCH-SERIES many v4 00/27] migration: strict config check for intra-cluster migration Fiona Ebner
2026-10-15 12:50 ` [PATCH common v4 01/27] tools: move version_cmp() helper from qemu-server Fiona Ebner
2026-10-15 12:50 ` [PATCH common v4 02/27] rest handler: handle: respect schema's 'type-property' when resolving type Fiona Ebner
2026-10-15 12:50 ` [PATCH cluster v4 03/27] cluster: move pvecfg node version helpers from qemu-server Fiona Ebner
2026-10-15 12:50 ` Fiona Ebner [this message]
2026-10-15 12:50 ` [PATCH ha-manager v4 05/27] manager: factor out helper to check if requested resource motion is valid Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 06/27] next state stopped: align logging for motion command with next_state_started() Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 07/27] next state {stopped,started}: factor out helper to handle motion command Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 08/27] lrm: resource migration: support extra migration options Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 09/27] change service state: support hash as a parameter value Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 10/27] next state: handle motion command: support migration options Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 11/27] resources: add migrate_json_properties() method Fiona Ebner
2026-10-16  9:51   ` Daniel Kral
2026-10-15 12:50 ` [PATCH ha-manager v4 12/27] queue resource motion: support migration options Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 13/27] crm command: support JSON-style migrate command Fiona Ebner
2026-10-16  9:53   ` Daniel Kral
2026-10-15 12:50 ` [PATCH ha-manager v4 14/27] api: resources: migration: support additional migration options Fiona Ebner
2026-10-16  9:54   ` Daniel Kral
2026-10-15 12:50 ` [PATCH ha-manager v4 15/27] test: add test for " Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 16/27] helpers: move version_cmp() helper to pve-common Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 17/27] helpers: move pvecfg node version helpers to pve-cluster Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 18/27] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 19/27] fix #7053: api: migrate: pass 'with-conntrack-state' flag to HA migration Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 20/27] qm: mtunnel: reply when a command is unknown Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 21/27] qm: mtunnel: add 'conf' command to do strict configuration parsing Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 22/27] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-10-15 12:50 ` [PATCH container v4 23/27] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-10-15 12:50 ` [PATCH container v4 24/27] pct: introduce mtunnel command Fiona Ebner
2026-10-15 12:50 ` [PATCH container v4 25/27] d/control: bump versioned build dependency for libpve-common-perl to 9.0.12 Fiona Ebner
2026-10-15 12:51 ` [PATCH container v4 26/27] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-10-15 12:51 ` [PATCH manager v4 27/27] ui: migrate: add checkbox to allow skipping newly enforced config check Fiona Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261015125112.174954-5-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal