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 D71E21FF0B7 for ; Fri, 13 Nov 2026 16:26:59 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 36D8F2178D; Fri, 13 Nov 2026 16:26:32 +0100 (CET) From: Dominik Rusovac To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v4 2/4] fix #6144: ui: ha: status: allow toggling maintenance mode Date: Fri, 13 Nov 2026 16:26:18 +0100 Message-ID: <20261113152620.2662417-3-d.rusovac@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261113152620.2662417-1-d.rusovac@proxmox.com> References: <20261113152620.2662417-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: 1794583585967 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.032 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: KKX2C22CSX52ROIC5XTUWG4K2T76RKR6 X-Message-ID-Hash: KKX2C22CSX52ROIC5XTUWG4K2T76RKR6 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 CC: Thomas Skinner X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: maintenance mode could only be enabled or disabled through the HA manager's CLI add a 'Node Maintenance' menu to the HA status panel, which requests enabling/disabling maintenance mode for the node of the selected lrm entry as the CRM only processes the request on its next round, show a spinner on the lrm entry of the node and keep the menu disabled for it until the status reports the requested state, like it is done when disarming HA enabling is not offered while HA is disarmed, as the CRM ignores such requests in that state. menu is disabled for users lacking the Sys.Modify privilege on nodes the LRM also enters maintenance mode on shutdown with the 'migrate' shutdown policy, which a disable request would not undo 'fa fa-check' icon was chosen for 'Disable' option to be consistent with which icon a node gets when coming back from maintenance mode Originally-by: Thomas Skinner Signed-off-by: Dominik Rusovac --- Notes: changes since v3: * reword commit subject and body * move the menu into the HA status panel toolbar next to Arm/Disarm, using its view model and controller instead of a second toolbar * decide the offered action based on the maintenance-requested flag * update the state on selection changes and store loads, which also handles deselection * use complete sentences for translatable strings * show a spinner on the lrm entry while a maintenance request is processed, like for disarming HA * disable 'Enable' while HA is disarmed * check Sys.Modify on nodes, matching the endpoint www/manager6/ha/Status.js | 102 ++++++++++++++++++++++++++++++++++ www/manager6/ha/StatusView.js | 36 +++++++++++- 2 files changed, 137 insertions(+), 1 deletion(-) diff --git a/www/manager6/ha/Status.js b/www/manager6/ha/Status.js index c01bd737..c040c1b2 100644 --- a/www/manager6/ha/Status.js +++ b/www/manager6/ha/Status.js @@ -11,6 +11,17 @@ Ext.define('PVE.ha.Status', { viewModel: { data: { haDisarmed: false, + maintenanceNode: null, + maintenanceRequested: false, + maintenancePending: false, + }, + formulas: { + noMaintenanceAction: (get) => + !get('maintenanceNode') || + get('maintenancePending') || + !Ext.state.Manager.get('GuiCap').nodes['Sys.Modify'], + // the CRM ignores requests to enable maintenance mode while HA is disarmed + noMaintenanceEnable: (get) => get('maintenanceRequested') || get('haDisarmed'), }, }, @@ -52,6 +63,67 @@ Ext.define('PVE.ha.Status', { ); }, + updateMaintenanceState: function () { + let me = this; + let vm = me.getViewModel(); + let sv = me.getView().down('pveHAStatusView'); + let rec = sv.getSelection()[0]; + let isLrm = rec?.get('type') === 'lrm'; + + vm.set('maintenanceNode', isLrm ? rec.get('node') : null); + vm.set('maintenanceRequested', isLrm && rec.get('maintenance-requested')); + vm.set('maintenancePending', isLrm && sv.isMaintenancePending(rec.get('node'))); + }, + + handleMaintenanceButton: function (menuItem) { + let me = this; + let node = me.getViewModel().get('maintenanceNode'); + if (!node) { + return; + } + + let msg; + if (menuItem.maintenanceMode === 'disable') { + msg = Ext.String.format( + gettext("Are you sure you want to disable maintenance mode for node '{0}'?"), + node, + ); + if (me.getViewModel().get('haDisarmed')) { + msg += + '

' + + Ext.String.format( + gettext("HA resources will be migrated back to node '{0}' once HA is re-armed."), + node, + ); + } + } else { + msg = Ext.String.format( + gettext("Are you sure you want to enable maintenance mode for node '{0}'?"), + node, + ); + msg += + '

' + + gettext('HA resources on the node will be migrated to other nodes.'); + } + + Ext.Msg.confirm(gettext('Confirm'), msg, function (btn) { + if (btn !== 'yes') { + return; + } + Proxmox.Utils.API2Request({ + url: `/nodes/${node}/maintenance`, + params: { 'maintenance-mode': menuItem.maintenanceMode }, + method: 'PUT', + success: function () { + let sv = me.getView().down('pveHAStatusView'); + sv.setMaintenancePending(node, menuItem.maintenanceMode === 'enable'); + me.updateMaintenanceState(); + }, + failure: (response) => Ext.Msg.alert(gettext('Error'), response.htmlStatus), + }); + }); + }, + openCRSOptions: function () { Ext.create('PVE.form.CRSOptions', { autoShow: true, @@ -121,6 +193,34 @@ Ext.define('PVE.ha.Status', { }, ], }, + '-', + { + text: gettext('Node Maintenance'), + iconCls: 'fa fa-wrench', + bind: { + disabled: '{noMaintenanceAction}', + }, + menu: [ + { + text: gettext('Enable'), + iconCls: 'fa fa-wrench', + maintenanceMode: 'enable', + bind: { + disabled: '{noMaintenanceEnable}', + }, + handler: 'handleMaintenanceButton', + }, + { + text: gettext('Disable'), + iconCls: 'fa fa-check', + maintenanceMode: 'disable', + bind: { + disabled: '{!maintenanceRequested}', + }, + handler: 'handleMaintenanceButton', + }, + ], + }, '->', { text: gettext('CRS Settings'), @@ -153,11 +253,13 @@ Ext.define('PVE.ha.Status', { collapsible: true, padding: '0 0 20 0', listeners: { + selectionchange: () => me.getController().updateMaintenanceState(), hastatuschange: function (isDisarmed) { let vm = me.getViewModel(); let sv = me.query('pveHAStatusView')[0]; vm.set('haDisarmed', isDisarmed); + me.getController().updateMaintenanceState(); if (sv.isDisarmedPendingState === null) { return; diff --git a/www/manager6/ha/StatusView.js b/www/manager6/ha/StatusView.js index f260bc0d..5e8f001e 100644 --- a/www/manager6/ha/StatusView.js +++ b/www/manager6/ha/StatusView.js @@ -23,6 +23,19 @@ Ext.define( me.getView().refresh(); }, + // maps node names to the expected value of their maintenance-requested field + maintenancePending: null, + + setMaintenancePending: function (node, requested) { + let me = this; + me.maintenancePending[node] = requested; + me.getView().refresh(); + }, + + isMaintenancePending: function (node) { + return this.maintenancePending[node] !== undefined; + }, + initComponent: function () { var me = this; @@ -30,6 +43,8 @@ Ext.define( throw 'no rstore given'; } + me.maintenancePending = {}; + Proxmox.Utils.monStoreErrors(me, me.rstore); var store = Ext.create('Proxmox.data.DiffStore', { @@ -52,6 +67,18 @@ Ext.define( }); me.rstore.on('load', function () { + let maintenanceDone = false; + for (const [node, requested] of Object.entries(me.maintenancePending)) { + let rec = store.getById(`lrm:${node}`); + if (!rec || rec.get('maintenance-requested') === requested) { + delete me.maintenancePending[node]; + maintenanceDone = true; + } + } + if (maintenanceDone) { + me.getView().refresh(); + } + let fencing = store.findRecord('type', 'fencing'); let disarmed = fencing && fencing.get('armed-state') === 'disarmed'; @@ -76,7 +103,10 @@ Ext.define( flex: 1, dataIndex: 'status', renderer: function (value, _metaData, rec) { - if (rec.data.type === 'fencing' && me.pending) { + if ( + (rec.data.type === 'fencing' && me.pending) || + (rec.data.type === 'lrm' && me.isMaintenancePending(rec.data.node)) + ) { return value + ' '; } return value; @@ -132,6 +162,10 @@ Ext.define( }, }, 'armed-state', + { + name: 'maintenance-requested', + type: 'boolean', + }, ], idProperty: 'id', }); -- 2.47.3