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 A5D1DC23C5 for ; Mon, 22 Jan 2024 15:24:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 80B691C454 for ; Mon, 22 Jan 2024 15:23:38 +0100 (CET) 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 ; Mon, 22 Jan 2024 15:23:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BD3BD465BD for ; Mon, 22 Jan 2024 15:23:36 +0100 (CET) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Mon, 22 Jan 2024 15:23:32 +0100 Message-ID: <20240122142333.215210-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.139 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH] fix: use fragmented block size for space calculation 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: Mon, 22 Jan 2024 14:24:08 -0000 We currently calculate the size of a datastore using `statfs64`, which returns the number of blocks in the fs and the two block sizes: fragemented block size(f_frsize) and block size (f_bsize). To calculate eg the total space in a datastore we use total_blocks * f_bsize, which is not always correct. `f_frsize` is the minimum unit of allocation on the filesystem (in bytes) and in 99% of the cases equal to `f_bsize`, but in some cases it differs. For example some filesystems allow smaller blocks for small files, in case f_frsize < f_bsize. In that case, f_frsize * total_blocks returns (mostly) the correct result (ceph also did some weird stuff, which is now being fixed though [0][1]). `statvfs` also documents this as the recommended way ('fsblkcnt_t f_blocks; /* Size of fs in f_frsize units */')[2]. This patch aligns the the behavior with the libc utilities (also used by `df`) [3]. Motivation: [4] (Forum post) [0]: https://tracker.ceph.com/issues/3793 [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=92a49fb0f79f3300e6e50ddf56238e70678e4202 [2]: https://www.man7.org/linux/man-pages/man3/statvfs.3.html [3]: https://git.savannah.gnu.org/cgit/gnulib.git/tree/lib/fsusage.c#n147 [4]: https://forum.proxmox.com/threads/pbs-3-1-2-wrong-datastore-information-sshfs.139875/#post-626959 Signed-off-by: Gabriel Goller --- proxmox-sys/src/fs/mod.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/proxmox-sys/src/fs/mod.rs b/proxmox-sys/src/fs/mod.rs index 8fb677c..44c3da5 100644 --- a/proxmox-sys/src/fs/mod.rs +++ b/proxmox-sys/src/fs/mod.rs @@ -121,12 +121,16 @@ pub fn fs_info(path: &P) -> nix::Result