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

Backport of [bug] Return a spec on reconnect into release/1.3.x #15222

Conversation

hc-github-team-nomad-core
Copy link
Contributor

Backport

This PR is auto-generated from #15214 to be assessed for backporting due to the inclusion of the label backport/1.3.x.

The below text is copied from the body of the original PR.


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

@hc-github-team-nomad-core hc-github-team-nomad-core force-pushed the backport/b-leaked-netns-and-fw-rules/definitely-genuine-maggot branch from 6a71c89 to f6c34a3 Compare November 11, 2022 18:36
@hc-github-team-nomad-core hc-github-team-nomad-core merged commit 3382bf2 into release/1.3.x Nov 11, 2022
@hc-github-team-nomad-core hc-github-team-nomad-core deleted the backport/b-leaked-netns-and-fw-rules/definitely-genuine-maggot branch November 11, 2022 18:36
@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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants