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

[bug] Return a spec on reconnect #15214

Merged
merged 2 commits into from
Nov 11, 2022
Merged

[bug] Return a spec on reconnect #15214

merged 2 commits into from
Nov 11, 2022

Conversation

angrycub
Copy link
Contributor

@angrycub angrycub commented Nov 11, 2022

This PR changes the behavior on reconnect from the behavior introduced in #9757.

if e, ok := err.(*os.PathError); ok && e.Err == syscall.EPERM {
nsPath := path.Join(nsutil.NetNSRunDir, allocID)
_, err := os.Stat(nsPath)
if err == nil {
return nil, false, nil

If the client enters this case and is returned a nil spec. When the network_hook's Postrun func is called to clean things up, the nil spec causes a fast exit.

func (h *networkHook) Postrun() error {
if h.spec == nil {
return nil
}

This PR changes the behavior when we encounter the existing network namespace to return the spec so that the Postrun behavior will run properly to reap the namespace.

Fixes #11096

@angrycub angrycub self-assigned this Nov 11, 2022
@angrycub angrycub requested a review from tgross November 11, 2022 05:23
@angrycub angrycub marked this pull request as ready for review November 11, 2022 05:23
@angrycub angrycub requested a review from shoenig November 11, 2022 05:24
Copy link
Member

@shoenig shoenig left a comment

Choose a reason for hiding this comment

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

LGTM! Be sure to add a CL entry

Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

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

LGTM!

From #9757:

safely handle

🤦 Guess not! What's insidious about this bug is that there's a "resources may have leaked" error just after the nil check in the PostRun, where we could have potentially caught this behavior.

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/1.2.x backport to 1.1.x release line backport/1.3.x backport to 1.3.x release line backport/1.4.x backport to 1.4.x release line theme/driver/exec theme/networking type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

network namespaces are not reconciled
3 participants