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.

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

[v0.60] Backport + version 0.60.3 #2170

Merged
merged 5 commits into from
Sep 20, 2024
Merged

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Sep 20, 2024

Back port of #2168, I had to fix some merge conflicts as main uses the new go 1.22 loop while here we still support go 1.21 so I had to change them back.

Needed for https://issues.redhat.com/browse/RHEL-59703

Create a new function to create the netns dir.

Signed-off-by: Paul Holzinger <[email protected]>
There are some rather bad problems when we bind mount over multiple
times, this is a rather small race but can happen. In order to avoid
this take an exclusive lock like ip netns add does because they create
the same bind mount setup. As such we will not race against other podman
process or ip netns add which is a good thing.

Signed-off-by: Paul Holzinger <[email protected]>
The new API should replace the logic from Podman's setupNetNS() which
did several things incorrect. First and foremost it never bind mounted
the netns dir causing problems when the netns dir was later bind mounted
duplicating the netns mounts on diffeent parents which then caused all
unmount attempts to fail[1].

Also the Podman code did never check for conlicts so we way end up
overwriting an existing netns (super unlikely as we use 16 random bytes
but still). At the very least it duplicates the name logic for no reason
there so having this all here makes much more sense.

Of course we still have to port podman over to this new API.

[1] https://issues.redhat.com/browse/RHEL-59620
Backport for https://issues.redhat.com/browse/RHEL-59703

Signed-off-by: Paul Holzinger <[email protected]>
This API is not used anywhere, as such remove it and make the loop in
NewNS() better as the netns dir parts should not be part of the loop.

Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: Paul Holzinger <[email protected]>
Copy link
Contributor

openshift-ci bot commented Sep 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99

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

@Luap99
Copy link
Member Author

Luap99 commented Sep 20, 2024

@TomSweeneyRedHat @mheon PTAL

@TomSweeneyRedHat
Copy link
Member

LGTM

@rhatdan
Copy link
Member

rhatdan commented Sep 20, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 20, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 91f5148 into containers:v0.60 Sep 20, 2024
13 checks passed
@Luap99 Luap99 deleted the v0.60 branch September 20, 2024 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants