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

Kill exec PIDs after main container exited #8162

Merged
merged 1 commit into from May 15, 2024

Conversation

saschagrunert
Copy link
Member

What type of PR is this?

/kind bug
/kind regression

What this PR does / why we need it:

Before applying this patch we killed the exec PIDs right away on container stop which leads into the failing e2e test:

[sig-node] [NodeFeature:SidecarContainers] Containers Lifecycle should terminate sidecars simultaneously if prestop doesn't exit

This regression is now fixed by killing the exec PIDs after the main container as well as in the same thread.

Needs a cherry-pick since the enhancement got already backported into supported release branches.

Which issue(s) this PR fixes:

Fixes kubernetes/kubernetes#124743

Special notes for your reviewer:

Follow-up on #7937

Does this PR introduce a user-facing change?

Fixed pod lifecycle regression where the exec PID's got killed before the actual container.

@openshift-ci openshift-ci bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label May 10, 2024
@openshift-ci openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. labels May 10, 2024
Copy link
Contributor

openshift-ci bot commented May 10, 2024

@saschagrunert: The label(s) kind/regression cannot be applied, because the repository doesn't have them.

In response to this:

What type of PR is this?

/kind bug
/kind regression

What this PR does / why we need it:

Before applying this patch we killed the exec PIDs right away on container stop which leads into the failing e2e test:

[sig-node] [NodeFeature:SidecarContainers] Containers Lifecycle should terminate sidecars simultaneously if prestop doesn't exit

This regression is now fixed by killing the exec PIDs after the main container as well as in the same thread.

Needs a cherry-pick since the enhancement got already backported into supported release branches.

Which issue(s) this PR fixes:

Fixes kubernetes/kubernetes#124743

Special notes for your reviewer:

Follow-up on #7937

Does this PR introduce a user-facing change?

Fixed pod lifecycle regression where the exec PID's got killed before the actual container.

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.

@kwilczynski
Copy link
Member

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2024
Copy link
Contributor

openshift-ci bot commented May 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kwilczynski, saschagrunert

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

Before applying this patch we killed the exec PIDs right away on
container stop which leads into the failing e2e test:

```
[sig-node] [NodeFeature:SidecarContainers] Containers Lifecycle should terminate sidecars simultaneously if prestop doesn't exit
```

This regression is now fixed by killing the exec PIDs after the main
container as well as in the same thread.

Fixes kubernetes/kubernetes#124743
Follow-up on cri-o#7937

Needs a cherry-pick since the enhancement got already backported into
supported release branches.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 10, 2024
Copy link
Member Author

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/hold

for #8162 (comment)

internal/oci/runtime_oci.go Show resolved Hide resolved
@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 10, 2024
Copy link

codecov bot commented May 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.58%. Comparing base (9712c53) to head (f03faf9).
Report is 6 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #8162   +/-   ##
=======================================
  Coverage   49.58%   49.58%           
=======================================
  Files         153      153           
  Lines       16930    16930           
=======================================
+ Hits         8394     8395    +1     
+ Misses       7489     7488    -1     
  Partials     1047     1047           

@saschagrunert
Copy link
Member Author

/retest

2 similar comments
@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@haircommander
Copy link
Member

haircommander commented May 10, 2024

thanks for the investigation and finding this!

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2024
@haircommander
Copy link
Member

/cherry-pick release-1.27

@openshift-cherrypick-robot

@haircommander: once the present PR merges, I will cherry-pick it on top of release-1.27 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.27

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.

@haircommander
Copy link
Member

/cherry-pick release-1.28
/cherry-pick release-1.29
/cherry-pick release-1.30

@openshift-cherrypick-robot

@haircommander: once the present PR merges, I will cherry-pick it on top of release-1.28 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.28
/cherry-pick release-1.29
/cherry-pick release-1.30

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.

@kwilczynski
Copy link
Member

/cherry-pick release-1.26
/cherry-pick release-1.25

@openshift-cherrypick-robot

@kwilczynski: once the present PR merges, I will cherry-pick it on top of release-1.26 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.26
/cherry-pick release-1.25

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.

@kwilczynski
Copy link
Member

/retest

11 similar comments
@kwilczynski
Copy link
Member

/retest

@kwilczynski
Copy link
Member

/retest

@kwilczynski
Copy link
Member

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/test ci-cgroupv2-integration

1 similar comment
@saschagrunert
Copy link
Member Author

/test ci-cgroupv2-integration

@openshift-merge-bot openshift-merge-bot bot merged commit d1e5398 into cri-o:main May 15, 2024
71 checks passed
@openshift-cherrypick-robot

@kwilczynski: new pull request created: #8176

In response to this:

/cherry-pick release-1.26
/cherry-pick release-1.25

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.

@openshift-cherrypick-robot

@kwilczynski: new pull request created: #8177

In response to this:

/cherry-pick release-1.26
/cherry-pick release-1.25

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.

@openshift-cherrypick-robot

@haircommander: new pull request created: #8178

In response to this:

/cherry-pick release-1.28
/cherry-pick release-1.29
/cherry-pick release-1.30

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.

@openshift-cherrypick-robot

@haircommander: new pull request created: #8179

In response to this:

/cherry-pick release-1.28
/cherry-pick release-1.29
/cherry-pick release-1.30

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.

@openshift-cherrypick-robot

@haircommander: new pull request created: #8180

In response to this:

/cherry-pick release-1.27

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.

@openshift-cherrypick-robot

@haircommander: new pull request created: #8181

In response to this:

/cherry-pick release-1.28
/cherry-pick release-1.29
/cherry-pick release-1.30

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.

@saschagrunert saschagrunert deleted the kill-exec-pids branch May 15, 2024 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
4 participants