fix(filesystem): add comma separator in mountOptionsString#3659
Open
LeandroSaldivarmrf wants to merge 2 commits into
Open
fix(filesystem): add comma separator in mountOptionsString#3659LeandroSaldivarmrf wants to merge 2 commits into
LeandroSaldivarmrf wants to merge 2 commits into
Conversation
mountOptionsString() was concatenating mount options without a separator, so isFilesystemReadOnly()'s strings.Split(opts, ",") could never find "ro" when it appeared alongside other options. As a result node_filesystem_readonly incorrectly reported 0 for any multi-option read-only mount, including ZFS filesystems mounted read-only and ext4 filesystems after a kernel emergency remount-ro triggered by errors=remount-ro. Also preallocate the slice with len(m) capacity, as suggested in review on prometheus#3507, to avoid repeated reallocations during append. Fixes: prometheus#3484 Fixes: prometheus#3576 Co-authored-by: Ray Tien <[email protected]> Signed-off-by: LeandroSaldivarmrf <[email protected]>
|
@LeandroSaldivarmrf overall it looks great, but I'd suggest the addition of a regression test, just to be safe here that everything is working. |
Signed-off-by: LeandroSaldivarmrf <[email protected]>
LeandroSaldivarmrf
force-pushed
the
fix/filesystem-readonly-mount-options
branch
from
e33b936 to
6de5129
Compare
Author
|
@nicolastakashi Thanks for the feedback! I've added two regression tests: TestMountOptionsString to verify the comma-separated output directly, and TestMountOptionsStringReadOnlyDetection to cover the end-to-end path, including the ZFS/remount-ro scenario from the original bug reports |
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
2 participants
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.
@discordianfish — supersedes #3507 which has been inactive since December 2025.
mountOptionsString() was concatenating mount options without a separator, so isFilesystemReadOnly()'s strings.Split(opts, ",") could never find "ro" when it appeared alongside other
options. As a result node_filesystem_readonly incorrectly reported 0 for any multi-option read-only mount, including ZFS filesystems mounted read-only and ext4 filesystems after a kernel
emergency remount-ro triggered by errors=remount-ro.
Also preallocate the slice with len(m) capacity, as suggested in review on #3507, to avoid repeated reallocations during append.