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

Cherrypick to v0.38: Return correct DeviceInfo from GetDirFsDevice on / path for Btrfs - Fix kubernetes issue #94335 #2775

Merged
merged 1 commit into from
Jan 12, 2021
Merged

Cherrypick to v0.38: Return correct DeviceInfo from GetDirFsDevice on / path for Btrfs - Fix kubernetes issue #94335 #2775

merged 1 commit into from
Jan 12, 2021

Conversation

gjkim42
Copy link
Contributor

@gjkim42 gjkim42 commented Jan 6, 2021

Backport pick fixes from #2752
(Fix kubernetes/kubernetes#94335)

@google-cla google-cla bot added the cla: yes label Jan 6, 2021
@k8s-ci-robot
Copy link
Collaborator

Hi @gjkim42. Thanks for your PR.

I'm waiting for a google member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@iwankgb
Copy link
Collaborator

iwankgb commented Jan 6, 2021

/ok-to-test

@iwankgb
Copy link
Collaborator

iwankgb commented Jan 6, 2021

/retest

1 similar comment
@bobbypage
Copy link
Collaborator

/retest

@bobbypage
Copy link
Collaborator

Please rebase, the CI failing test should be fixed now after #2780

@gjkim42 gjkim42 force-pushed the 0.38-backport-2752 branch from 2c940af to 34750c2 Compare January 7, 2021 10:23
@gjkim42
Copy link
Contributor Author

gjkim42 commented Jan 7, 2021

Please rebase, the CI failing test should be fixed now after #2780

rebased! Thanks 👍

@gjkim42 gjkim42 force-pushed the 0.38-backport-2752 branch from 34750c2 to 6f5b51a Compare January 10, 2021 06:00
@gjkim42
Fix kubernetes issue #94335
d3d4900 
- Issue: kubernetes/kubernetes#94335
- Fix `GetDirFsDevice` to return correct `*DeviceInfo` when "/" is Btrfs
    - Refactor to call new function `mountInfoFromDir` that returns
      `*MountInfo` which `dir` belongs
- Add TestMountInfoFromDir to verify the fix

Signed-off-by: Geonju Kim <[email protected]>
@gjkim42 gjkim42 force-pushed the 0.38-backport-2752 branch from 6f5b51a to d3d4900 Compare January 10, 2021 09:22
@bobbypage
Copy link
Collaborator

Sorry for delay, I wanted to validate the fix, ref: #2752 (comment)

LGTM, thanks again! I will cut a new patch release shortly with this fix.

@bobbypage bobbypage merged commit 57a2c80 into google:release-v0.38 Jan 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobbypage bobbypage bobbypage approved these changes

Assignees
No one assigned
Labels
cla: yes ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gjkim42 @k8s-ci-robot @iwankgb @bobbypage