Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release-24.2: storage: fix incorrect mount association #137113

Merged
merged 1 commit into from
Dec 13, 2024
Merged

release-24.2: storage: fix incorrect mount association #137113

merged 1 commit into from
Dec 13, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Dec 10, 2024

Backport 1/1 commits from #137024 on behalf of @RaduBerinde.

/cc @cockroachdb/release

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: #137021

Release note (bug fix): Fixed bug that causes an incorrect filesystem
to be logged as part of the store information.

Release justification:

@RaduBerinde
storage: fix incorrect mount association
bd5e8fa 
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: #137021

Release note (bug fix): Fixed bug that causes an incorrect filesystem
to be logged as part of the store information.
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.2-137024 branch from d48a5cd to bd5e8fa Compare December 10, 2024 18:47
@blathers-crl blathers-crl bot requested a review from a team as a code owner December 10, 2024 18:47
@blathers-crl blathers-crl bot requested a review from aadityasondhi December 10, 2024 18:47
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Dec 10, 2024
@blathers-crl blathers-crl bot requested a review from jbowens December 10, 2024 18:47
@blathers-crl blathers[crl]
Copy link
Author

blathers-crl bot commented Dec 10, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues     or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Dec 10, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@RaduBerinde RaduBerinde merged commit 7771f24 into release-24.2 Dec 13, 2024
18 of 20 checks passed
@RaduBerinde RaduBerinde deleted the blathers/backport-release-24.2-137024 branch December 13, 2024 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jbowens jbowens jbowens approved these changes

@aadityasondhi aadityasondhi Awaiting requested review from aadityasondhi aadityasondhi is a code owner automatically assigned from cockroachdb/storage

Assignees

@RaduBerinde RaduBerinde

Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cockroach-teamcity @jbowens @RaduBerinde