storage: fix incorrect mount association #137024
Merged
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
RaduBerinde
added
backport-24.1.x
|
This change is |
RaduBerinde
force-pushed
the
fix-store-properties-dir-check
branch
2 times, most recently
from
26573c6 to
f05227c
Compare
jbowens
approved these changes
Dec 9, 2024
There was a problem hiding this comment.
Reviewed 3 of 3 files at r1, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @RaduBerinde)
We use `filepath.Rel` to associate a data directory with a mountpoint, but the code incorrectly tolerates a result which starts with `../`. This commit adds a check for this case. Fixes: cockroachdb#137021 Release note (bug fix): Fixed bug that causes an incorrect filesystem to be logged as part of the store information.
RaduBerinde
force-pushed
the
fix-store-properties-dir-check
branch
from
f05227c to
46a3e88
Compare
|
Test failure is #136592 bors r+ |
This was referenced Dec 10, 2024
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.
We use
filepath.Relto associate a data directory with a mountpoint,but the code incorrectly tolerates a result which starts with
../.This commit adds a check for this case.
Fixes: #137021
Release note (bug fix): Fixed bug that causes an incorrect filesystem
to be logged as part of the store information.