all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Rusovac <d.rusovac@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-ha-manager v5 05/10] manager: standardize log messages for maintenance mode request
Date: Thu, 19 Nov 2026 10:59:26 +0100	[thread overview]
Message-ID: <20261119095931.1748970-6-d.rusovac@proxmox.com> (raw)
In-Reply-To: <20261119095931.1748970-1-d.rusovac@proxmox.com>

log messages for maintenance mode request now share a format describing
what the command does, and no longer depend on cmd variable

adapt the affected test logs accordingly

Signed-off-by: Dominik Rusovac <d.rusovac@proxmox.com>
---

Notes:
    new in v5

 src/PVE/HA/Manager.pm                             | 6 +++---
 src/test/test-crm-maintenance-request2/log.expect | 2 +-
 src/test/test-crm-maintenance-request6/log.expect | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index 5c21fbe..90ef89d 100644
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -794,17 +794,17 @@ sub update_crm_commands {
             if ($ms->{disarm}) {
                 $haenv->log(
                     'warning',
-                    "ignoring maintenance command for node $node - HA stack is disarmed",
+                    "ignoring maintenance mode request for node '$node' - HA stack is disarmed",
                 );
             } elsif ($state eq 'online') {
                 $ms->{node_request}->{$node}->{maintenance} = 1;
             } elsif ($state eq 'maintenance') {
                 $haenv->log(
                     'info',
-                    "ignoring crm command - node $node is already in maintenance state",
+                    "ignoring maintenance mode request for node '$node' - node is already in maintenance state",
                 );
             } else {
-                $haenv->log('err', "crm command error - node not online: $cmd");
+                $haenv->log('err', "maintenance mode request error - node '$node' not online");
             }
         } elsif ($cmd =~ m/^disable-node-maintenance\s+(\S+)$/) {
             my $node = $1;
diff --git a/src/test/test-crm-maintenance-request2/log.expect b/src/test/test-crm-maintenance-request2/log.expect
index c8d2563..abf86f8 100644
--- a/src/test/test-crm-maintenance-request2/log.expect
+++ b/src/test/test-crm-maintenance-request2/log.expect
@@ -43,7 +43,7 @@ info    165    node3/crm: killed by poweroff
 info    166    node3/lrm: killed by poweroff
 info    166     hardware: server 'node3' stopped by poweroff (watchdog)
 info    220      cmdlist: execute crm node3 enable-node-maintenance
-err     220    node1/crm: crm command error - node not online: enable-node-maintenance node3
+err     220    node1/crm: maintenance mode request error - node 'node3' not online
 info    240    node1/crm: got lock 'ha_agent_node3_lock'
 info    240    node1/crm: fencing: acknowledged - got agent lock for node 'node3'
 info    240    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
diff --git a/src/test/test-crm-maintenance-request6/log.expect b/src/test/test-crm-maintenance-request6/log.expect
index 1db9138..7ca0d61 100644
--- a/src/test/test-crm-maintenance-request6/log.expect
+++ b/src/test/test-crm-maintenance-request6/log.expect
@@ -42,7 +42,7 @@ info    160    node1/crm: service 'vm:103': state changed from 'migrate' to 'sta
 info    163    node2/lrm: starting service vm:103
 info    163    node2/lrm: service status vm:103 started
 info    220      cmdlist: execute crm node3 enable-node-maintenance
-info    220    node1/crm: ignoring crm command - node node3 is already in maintenance state
+info    220    node1/crm: ignoring maintenance mode request for node 'node3' - node is already in maintenance state
 info    320      cmdlist: execute crm node1 disarm-ha freeze
 info    320    node1/crm: got crm command: disarm-ha freeze
 info    320    node1/crm: disarm: freezing service 'vm:101' (was 'started')
@@ -55,7 +55,7 @@ info    323    node2/lrm: status change active => wait_for_agent_lock
 info    340    node1/crm: all LRMs disarmed, HA stack is now fully disarmed
 info    340    node1/crm: HA stack fully disarmed, releasing CRM watchdog
 info    420      cmdlist: execute crm node2 enable-node-maintenance
-warn    420    node1/crm: ignoring maintenance command for node node2 - HA stack is disarmed
+warn    420    node1/crm: ignoring maintenance mode request for node 'node2' - HA stack is disarmed
 info    520      cmdlist: execute crm node1 arm-ha
 info    520    node1/crm: got crm command: arm-ha
 info    520    node1/crm: re-arming HA stack
-- 
2.47.3





  parent reply	other threads:[~2026-11-19 10:00 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19  9:59 [PATCH-SERIES docs/ha-manager/manager v5 00/10] fix #6144: add api and ui for node maintenance mode Dominik Rusovac
2026-11-19  9:59 ` [PATCH pve-manager v5 01/10] fix #6144: api: nodes: add endpoint to set " Dominik Rusovac
2026-11-19  9:59 ` [PATCH pve-manager v5 02/10] fix #6144: ui: ha: status: allow toggling " Dominik Rusovac
2026-11-19  9:59 ` [PATCH pve-manager v5 03/10] ui: ha: status: show spinner while maintenance mode request is queued Dominik Rusovac
2026-11-19  9:59 ` [PATCH pve-ha-manager v5 04/10] test: add test for ignoring maintenance mode request Dominik Rusovac
2026-11-19  9:59 ` Dominik Rusovac [this message]
2026-11-19  9:59 ` [PATCH pve-ha-manager v5 06/10] manager: factor out check for " Dominik Rusovac
2026-11-19  9:59 ` [PATCH pve-ha-manager v5 07/10] cli: reject maintenance mode requests rejected by crm Dominik Rusovac
2026-11-19  9:59 ` [PATCH pve-ha-manager v5 08/10] api: status: report maintenance mode request for lrm entries Dominik Rusovac
2026-11-19  9:59 ` [PATCH pve-ha-manager v5 09/10] api: status: report queued " Dominik Rusovac
2026-11-19  9:59 ` [PATCH pve-docs v5 10/10] ha-manager: maintenance mode: mention web ui menu Dominik Rusovac
2026-11-19 22:28 ` applied: [PATCH-SERIES docs/ha-manager/manager v5 00/10] fix #6144: add api and ui for node maintenance mode Thomas Lamprecht

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=20261119095931.1748970-6-d.rusovac@proxmox.com \
    --to=d.rusovac@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal