Skip to content

chroot createPlatformContainer: use MS_REMOUNT #5992

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.

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

Merged
merged 1 commit into from
Feb 19, 2025

Conversation

nalind
Copy link
Member

@nalind nalind commented Feb 18, 2025

What type of PR is this?

/kind bug

What this PR does / why we need it:

When setting mount propagation on the root mount before unmounting it, use MS_REBIND, since we know it's already a bind mount, and we actually want to affect the extant bind mount instead of creating another right over it. Otherwise, we might as well have not bothered.

How to verify it

New integration test!

Which issue(s) this PR fixes:

Related to KONFLUX-5871.

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added kind/bug Categorizes issue or PR as related to a bug. approved labels Feb 18, 2025
Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@flouthoc
Copy link
Collaborator

@nalind This needs a rebase.

@nalind
Copy link
Member Author

nalind commented Feb 19, 2025

Rebased.

When setting mount propagation on the root mount before unmounting it,
use MS_REBIND, since we know it's already a bind mount, and we actually
want to affect the extant bind mount instead of creating another right
over it. Otherwise, we might as well have not bothered.

Signed-off-by: Nalin Dahyabhai <[email protected]>
@flouthoc
Copy link
Collaborator

/lgtm
/approve

Copy link
Contributor

openshift-ci bot commented Feb 19, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, nalind

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 5b8423e into containers:main Feb 19, 2025
33 of 34 checks passed
@nalind nalind deleted the remount-pivot branch February 19, 2025 20:14
@nalind
Copy link
Member Author

nalind commented Feb 24, 2025

/cherry-pick release-1.39
@TomSweeneyRedHat that should fix #6001/RHEL-80446 and #5874 (comment).

@openshift-cherrypick-robot

@nalind: #5992 failed to apply on top of branch "release-1.39":

Applying: chroot createPlatformContainer: use MS_REMOUNT
Using index info to reconstruct a base tree...
M	tests/run.bats
Falling back to patching base and 3-way merge...
Auto-merging tests/run.bats
CONFLICT (content): Merge conflict in tests/run.bats
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 chroot createPlatformContainer: use MS_REMOUNT

In response to this:

/cherry-pick release-1.39
@TomSweeneyRedHat that should fix #6001/RHEL-80446 and #5874 (comment).

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved kind/bug Categorizes issue or PR as related to a bug. lgtm
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants