From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3CDAE8A62A for ; Tue, 26 Jul 2022 15:53:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 33999341D6 for ; Tue, 26 Jul 2022 15:53:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 26 Jul 2022 15:52:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 89ECB42C72 for ; Tue, 26 Jul 2022 15:44:50 +0200 (CEST) From: Daniel Tschlatscher To: pbs-devel@lists.proxmox.com Date: Tue, 26 Jul 2022 15:44:39 +0200 Message-Id: <20220726134441.403635-1-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.095 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [status.total, disk.dev, status.rs, proxmox-backup-proxy.rs] Subject: [pbs-devel] [PATCH proxmox-backup v3 1/3] fix #4077: Estimated Full metric on ext4 file systems X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jul 2022 13:53:00 -0000 The rrd data now includes tracking the total disk usage for the unpri- vileged backup user. The calculation for the estimated_time_full was adapted to use the total for the unpriviliged user. The unpriv_total is the sum of the used space in the file system, plus the available space for the unpriviliged user. Signed-off-by: Daniel Tschlatscher --- Changes from v2: * Rebased this patch for the current master src/api2/status.rs | 3 ++- src/bin/proxmox-backup-proxy.rs | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api2/status.rs b/src/api2/status.rs index d6dec9d2..650dde98 100644 --- a/src/api2/status.rs +++ b/src/api2/status.rs @@ -84,7 +84,8 @@ pub async fn datastore_status( let get_rrd = |what: &str| extract_rrd_data(&rrd_dir, what, RRDTimeFrame::Month, RRDMode::Average); - let total_res = get_rrd("total")?; + // Use the space for the unpriviliged user, as e.g. ext4 reserves 5% of disks for root only + let total_res = get_rrd("unpriv_total")?; let used_res = get_rrd("used")?; if let (Some((start, reso, total_list)), Some((_, _, used_list))) = (total_res, used_res) { diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 4c57b2dd..b91aa66d 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -1273,6 +1273,8 @@ fn rrd_update_disk_stat(disk: &DiskStat, rrd_prefix: &str) { rrd_update_gauge(&rrd_key, status.total as f64); let rrd_key = format!("{}/used", rrd_prefix); rrd_update_gauge(&rrd_key, status.used as f64); + let rrd_key = format!("{}/unpriv_total", rrd_prefix); + rrd_update_gauge(&rrd_key, (status.used + status.available) as f64); } if let Some(stat) = &disk.dev { -- 2.30.2