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 06/10] manager: factor out check for maintenance mode request
Date: Thu, 19 Nov 2026 10:59:27 +0100	[thread overview]
Message-ID: <20261119095931.1748970-7-d.rusovac@proxmox.com> (raw)
In-Reply-To: <20261119095931.1748970-1-d.rusovac@proxmox.com>

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 <d.rusovac@proxmox.com>
---

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





  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 ` [PATCH pve-ha-manager v5 05/10] manager: standardize log messages for " Dominik Rusovac
2026-11-19  9:59 ` Dominik Rusovac [this message]
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-7-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