fix: Inconsistent total capacity in CGI and statfs #309
+5
−3
Conversation
This file contains 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
The CGI and statfs system call where reporting different total capacities of the filesystem. The CGI monitoring was showing the total capacity of all hard drives, regardless of limits in HDD_LEAVE_SPACE_DEFAULT option. Meanwhile, statfs was showing total capacity as space available on all hard drives + actual used bytes for chunks (or the reported total capacity on all hard drives, whichever was lower). This commit tries to get rid of these discrepancies by discounting the HDD_LEAVE_SPACE_DEFAULT value towards the final capacity of a drive in the chunkserver. Both statfs and CGI will now show this capacity in the same way. Signed-off-by: Urmas Rist <[email protected]>
uristdwarf
force-pushed
the
fix-totalspace
branch
from
54a41e2 to
b6f7d12
Compare
rolysr
approved these changes
Feb 27, 2025
| @@ -84,6 +84,11 @@ void CmrDisk::refreshDataDiskUsage() { | |||
| } else { | |||
| setAvailableSpace(availableSpace() - leaveFreeSpace()); | |||
| } | |||
| if (totalSpace() < leaveFreeSpace()) { | |||
| setTotalSpace(0ULL); | |||
There was a problem hiding this comment.
Consider setting the value passed here as a constant.
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.
The CGI and statfs system call where reporting different total capacities of the filesystem.
The CGI monitoring was showing the total capacity of all hard drives, regardless of limits in HDD_LEAVE_SPACE_DEFAULT option. Meanwhile, statfs was showing total capacity as space available on all hard drives + actual used bytes for chunks (or the reported total capacity on all hard drives, whichever was lower).
This commit tries to get rid of these discrepancies by discounting the HDD_LEAVE_SPACE_DEFAULT value towards the final capacity of a drive in the chunkserver. Both statfs and CGI will now show this capacity in the same way.