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 90B721FF0DF for ; Thu, 19 Nov 2026 11:00:25 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 12267217A5; Thu, 19 Nov 2026 10:59:43 +0100 (CET) From: Dominik Rusovac To: pve-devel@lists.proxmox.com Subject: [PATCH pve-ha-manager v5 06/10] manager: factor out check for maintenance mode request Date: Thu, 19 Nov 2026 10:59:27 +0100 Message-ID: <20261119095931.1748970-7-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: 1795082375462 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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: ATSWBFYRGMXTBKTXTV5YEKCIEINLZVOC X-Message-ID-Hash: ATSWBFYRGMXTBKTXTV5YEKCIEINLZVOC 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: move the reasons why the crm ignores a maintenance mode request into a helper, so that the CLI can use the same logic to reject such requests in advance, instead of queuing a crm command that is only ignored with a log message Signed-off-by: Dominik Rusovac --- Notes: new in v5: * uses signature for function in Helpers to be consistent with rest of file src/PVE/HA/Config.pm | 9 +++++++++ src/PVE/HA/Helpers.pm | 21 +++++++++++++++++++++ src/PVE/HA/Manager.pm | 19 ++++++------------- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm index bee1ac7..b3ab77b 100644 --- a/src/PVE/HA/Config.pm +++ b/src/PVE/HA/Config.pm @@ -423,6 +423,15 @@ sub get_resource_motion_info { return ($dependent_resources, $blocking_resources_by_node); } +sub check_enable_maintenance { + my ($node, $log_fn) = @_; + + my $ms = read_manager_status(); + my $ns = ($ms->{node_status} // {})->{$node} // 'unknown'; + + return PVE::HA::Helpers::check_enable_maintenance($log_fn, $node, $ns, $ms); +} + # graceful, as long as locking + cfs_write works sub delete_service_from_config { my ($sid, $purge) = @_; diff --git a/src/PVE/HA/Helpers.pm b/src/PVE/HA/Helpers.pm index a58b1e1..ba69093 100644 --- a/src/PVE/HA/Helpers.pm +++ b/src/PVE/HA/Helpers.pm @@ -60,4 +60,25 @@ sub get_resource_motion_info($ss, $sid, $cd, $online_nodes, $compiled_rules) { return ($dependent_resources, $blocking_resources_by_node); } +sub check_enable_maintenance($log_fn, $node, $node_state, $ms) { + if ($ms->{disarm}) { + $log_fn->( + 'warning', + "ignoring maintenance mode request for node '$node' - HA stack is disarmed", + ); + return 0; + } elsif ($node_state eq 'maintenance') { + $log_fn->( + 'info', + "ignoring maintenance mode request for node '$node' - node is already in maintenance state", + ); + return 0; + } elsif ($node_state ne 'online') { + $log_fn->('err', "maintenance mode request error - node '$node' not online"); + return 0; + } + + return 1; +} + 1; diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index 90ef89d..c012750 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -770,6 +770,11 @@ sub update_crm_commands { my $cmdlist = $haenv->read_crm_commands(); + my $log_fn = sub { + my ($level, $msg) = @_; + $haenv->log($level, $msg); + }; + foreach my $cmd (split(/\n/, $cmdlist)) { chomp $cmd; @@ -791,20 +796,8 @@ sub update_crm_commands { my $node = $1; my $state = $ns->get_node_state($node); - if ($ms->{disarm}) { - $haenv->log( - 'warning', - "ignoring maintenance mode request for node '$node' - HA stack is disarmed", - ); - } elsif ($state eq 'online') { + if (PVE::HA::Helpers::check_enable_maintenance($log_fn, $node, $state, $ms)) { $ms->{node_request}->{$node}->{maintenance} = 1; - } elsif ($state eq 'maintenance') { - $haenv->log( - 'info', - "ignoring maintenance mode request for node '$node' - node is already in maintenance state", - ); - } else { - $haenv->log('err', "maintenance mode request error - node '$node' not online"); } } elsif ($cmd =~ m/^disable-node-maintenance\s+(\S+)$/) { my $node = $1; -- 2.47.3