From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id BEAF31FF0DF for ; Thu, 19 Nov 2026 11:00:53 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 8309821824; Thu, 19 Nov 2026 10:59:44 +0100 (CET) From: Dominik Rusovac 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 Message-ID: <20261119095931.1748970-6-d.rusovac@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261119095931.1748970-1-d.rusovac@proxmox.com> References: <20261119095931.1748970-1-d.rusovac@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795082375397 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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: TMTZOA4QXAY4MNHLK6M5CJWM6AHQ5BB7 X-Message-ID-Hash: TMTZOA4QXAY4MNHLK6M5CJWM6AHQ5BB7 X-MailFrom: d.rusovac@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: 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 --- 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