[disk][linux]: fix parsing mount option when use 1/mounts on Partition #1861
Conversation
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
5 tasks
ccoVeille
reviewed
May 24, 2025
disk/disk_linux.go
Outdated
| Opts: strings.Fields(fields[3]), | ||
| Opts: strings.Split(fields[3], ","), |
There was a problem hiding this comment.
No test to update/add for the issue you describe?
7b5356f to
d63507d
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR fixes an issue where mount options were incorrectly parsed when falling back to reading /proc/1/mounts, and it adds tests for the parsing functions.
- Fixes mount option parsing by splitting comma-separated options.
- Introduces dedicated functions parseFieldsOnMounts and parseFieldsOnMountinfo along with corresponding tests.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| disk/disk_linux_test.go | Added tests for both mountinfo and mounts parsing logic. |
| disk/disk_linux.go | Updated the parsing logic and error handling in PartitionsWithContext. |
8224b2a to
9896b27
Compare
ccoVeille
reviewed
Jun 1, 2025
ccoVeille
approved these changes
Jun 1, 2025
451e4cf to
0e773f1
Compare
Co-authored-by: ccoVeille <3875889+ccoVeille@users.noreply.github.com>
0e773f1 to
d3578cf
Compare
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.
This fixes #1858.
On
disk.Parition()When we can not read/proc/1/mountinfobecause version <2.6.26, fallback to read/proc/1/mounts. However, mount options are not splitted.Here is a example line of
mounts,and this is parsed like this,
optsis just one long line.This PR fixes this issue.
Add tests
This PR also split parse to
parseFieldsOnMountsandparseFieldsOnMountinfo. These functions are used according to which file is used. And also introduce tests for those functions.