From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 7C23B1FF13B for ; Wed, 03 Jun 2026 17:23:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5D254115D0; Wed, 3 Jun 2026 17:23:47 +0200 (CEST) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Subject: [PATCH v1 proxmox-backup 1/2] www: fix incorrect prune count on datastores summary Date: Wed, 3 Jun 2026 17:22:16 +0200 Message-ID: <20260603152257.285923-2-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260603152257.285923-1-r.obkircher@proxmox.com> References: <20260603152257.285923-1-r.obkircher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1780500156611 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.051 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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: CD5XBFNWWUIT2UMA3HT6NHLPKZI2SVVZ X-Message-ID-Hash: CD5XBFNWWUIT2UMA3HT6NHLPKZI2SVVZ X-MailFrom: r.obkircher@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 Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The number of prune tasks was always zero because they were summed up using an incorrect datastore ID. Taking only the part before the first colon fixes this issue. This caused some confusion in a forum thread about unexpected disk usage. Fixes: https://forum.proxmox.com/threads/183886 Signed-off-by: Robert Obkircher --- www/Utils.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/www/Utils.js b/www/Utils.js index bf4b025c7..8f382a3b4 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -280,7 +280,10 @@ Ext.define('PBS.Utils', { } else if (type === 'garbage_collection') { return id; } else if (type === 'prune') { - return id; + res = PBS.Utils.PRUNE_JOB_ID_RE.exec(id); + if (res) { + result = res[1]; + } } return result; @@ -410,6 +413,9 @@ Ext.define('PBS.Utils', { ':', ); me.BACKUP_JOB_ID_RE = new RegExp('^' + PROXMOX_SAFE_ID_REGEX + ':'); + // Only parse the datastore for now, ignore the optional namespace. + // Examples: "datastore1::host/devel", "datastore2:" + me.PRUNE_JOB_ID_RE = new RegExp('^' + PROXMOX_SAFE_ID_REGEX + '(?::|$)'); // do whatever you want here Proxmox.Utils.override_task_descriptions({ -- 2.47.3