all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Robert Obkircher <r.obkircher@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup 6/6] fix #5797: www: display new GarbageCollection maintenance mode
Date: Tue,  2 Jun 2026 14:59:02 +0200	[thread overview]
Message-ID: <20260602130001.217482-12-r.obkircher@proxmox.com> (raw)
In-Reply-To: <20260602130001.217482-1-r.obkircher@proxmox.com>

Display the new mode and make it selectable. Subtract non-expanding
writes from the number of conflicts, since they are allowed in this
mode.

Fixes: https://bugzilla.proxmox.com/show_bug.cgi?id=5797
Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
---
 www/Utils.js                     | 4 ++++
 www/datastore/OptionView.js      | 3 +++
 www/window/MaintenanceOptions.js | 1 +
 3 files changed, 8 insertions(+)

diff --git a/www/Utils.js b/www/Utils.js
index bf4b025c7..fa49fcbf8 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -824,6 +824,7 @@ Ext.define('PBS.Utils', {
         if (activeTasks !== undefined) {
             const conflictingTasks =
                 activeTasks.write +
+                (type === 'garbage-collection' ? -activeTasks.writeNonExpanding : 0) +
                 (type === 'offline' || type === 'unmount' ? activeTasks.read : 0);
 
             if (conflictingTasks > 0) {
@@ -846,6 +847,9 @@ Ext.define('PBS.Utils', {
             case 'read-only':
                 modeText = gettext('Read-only');
                 break;
+            case 'garbage-collection':
+                modeText = gettext('Garbage Collection');
+                break;
             case 'offline':
                 modeText = gettext('Offline');
                 break;
diff --git a/www/datastore/OptionView.js b/www/datastore/OptionView.js
index 64e47aa57..683770738 100644
--- a/www/datastore/OptionView.js
+++ b/www/datastore/OptionView.js
@@ -93,6 +93,7 @@ Ext.define('PBS.Datastore.Options', {
         me.maintenanceActiveTasks = {
             read: 0,
             write: 0,
+            writeNonExpanding: 0,
         };
         me.datastore = encodeURIComponent(me.datastore);
         me.url = `/api2/json/config/datastore/${me.datastore}`;
@@ -125,9 +126,11 @@ Ext.define('PBS.Datastore.Options', {
                 if (success) {
                   activeTasks.read = store.getById('read')?.data.value ?? 0;
                   activeTasks.write = store.getById('write')?.data.value ?? 0;
+                  activeTasks.writeNonExpanding = store.getById('writeNonExpanding')?.data.value ?? 0;
                 } else {
                   activeTasks.read = 0;
                   activeTasks.write = 0;
+                  activeTasks.writeNonExpanding = 0;
                 }
             });
         },
diff --git a/www/window/MaintenanceOptions.js b/www/window/MaintenanceOptions.js
index 9a735e5e8..9228f4ee9 100644
--- a/www/window/MaintenanceOptions.js
+++ b/www/window/MaintenanceOptions.js
@@ -5,6 +5,7 @@ Ext.define('PBS.form.maintenanceType', {
     comboItems: [
         ['__default__', gettext('None')],
         ['read-only', gettext('Read only')],
+        ['garbage-collection', gettext('Garbage Collection')],
         ['offline', gettext('Offline')],
     ],
 });
-- 
2.47.3





  parent reply	other threads:[~2026-06-02 13:01 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-02 12:58 [PATCH proxmox{,-backup} 00/11] add GarbageCollection maintenance mode Robert Obkircher
2026-06-02 12:58 ` [PATCH proxmox 1/5] pbs-api-types: propagate maintenance mode parse errors Robert Obkircher
2026-06-03 10:33   ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 2/5] pbs-api-types: use match statement for maintenance mode check Robert Obkircher
2026-06-03 10:36   ` Christian Ebner
2026-06-03 11:04     ` Robert Obkircher
2026-06-03 11:30       ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 3/5] pbs-api-types: deny non-lookup operations for unknown modes Robert Obkircher
2026-06-03 10:38   ` Christian Ebner
2026-06-03 11:18     ` Robert Obkircher
2026-06-03 11:38       ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 4/5] pbs-api-types: add WriteNonExpanding datastore operation Robert Obkircher
2026-06-03 10:45   ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 5/5] pbs-api-types: add GarbageCollection maintenance mode Robert Obkircher
2026-06-03 10:50   ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox-backup 1/6] datastore: propagate maintenance mode parse errors Robert Obkircher
2026-06-03 11:20   ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox-backup 2/6] task tracking: use parameter for initial count and refactor updates Robert Obkircher
2026-06-03 11:58   ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox-backup 3/6] www: access active operation fields by name instead of index Robert Obkircher
2026-06-03 12:04   ` Christian Ebner
2026-06-02 12:59 ` [PATCH proxmox-backup 4/6] task tracking: count WriteNonExpanding datastore operations Robert Obkircher
2026-06-03 12:18   ` Christian Ebner
2026-06-02 12:59 ` [PATCH proxmox-backup 5/6] datastore: open datastores with WriteNonExpanding instead of Write Robert Obkircher
2026-06-03 12:28   ` Christian Ebner
2026-06-02 12:59 ` Robert Obkircher [this message]
2026-06-03 13:03   ` [PATCH proxmox-backup 6/6] fix #5797: www: display new GarbageCollection maintenance mode Christian Ebner
2026-06-03 13:28 ` [PATCH proxmox{,-backup} 00/11] add " Christian Ebner

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=20260602130001.217482-12-r.obkircher@proxmox.com \
    --to=r.obkircher@proxmox.com \
    --cc=pbs-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