Repository navigation
check_files: fix du based disksize tests on FreeBSD - #497
Merged
Merged
Conversation
FreeBSD's du prints block counts in units of $BLOCKSIZE, while -B1 only rounds the internal accounting block size up to 512 bytes. Since /etc/login.conf sets BLOCKSIZE=K (inherited by ssh sessions), du -B1 printed 1 KiB blocks and the tests compared that against 512-byte blocks, failing by a factor of two. The previous ZFS based VM image masked this: freshly written files reported 0 or 1 blocks, so ceil(blocks / 2) == blocks and the wrong conversion happened to match. The UFS image shipped with vmactions/freebsd-vm v1.6.0 reports real block counts and exposed the unit mismatch. Pin BLOCKSIZE=512 for the du child so BSD du reports 512-byte blocks again. GNU du's -B1 already means bytes, so Linux is unaffected. No production code changes; disksize stays st_blocks * 512.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
AI GENERATED
FreeBSD's du prints block counts in units of $BLOCKSIZE, while -B1 only rounds the internal accounting block size up to 512 bytes. Since /etc/login.conf sets BLOCKSIZE=K (inherited by ssh sessions), du -B1 printed 1 KiB blocks and the tests compared that against 512-byte blocks, failing by a factor of two.
The previous ZFS based VM image masked this: freshly written files reported 0 or 1 blocks, so ceil(blocks / 2) == blocks and the wrong conversion happened to match. The UFS image shipped with vmactions/freebsd-vm v1.6.0 reports real block counts and exposed the unit mismatch.
Pin BLOCKSIZE=512 for the du child so BSD du reports 512-byte blocks again. GNU du's -B1 already means bytes, so Linux is unaffected. No production code changes; disksize stays st_blocks * 512.