oci: keep track of exec PIDs and stop them on container stop #7937
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Skipping CI for Draft Pull Request. |
5bad8f6 to
0b4aacc
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #7937 +/- ##
==========================================
- Coverage 48.93% 48.88% -0.06%
==========================================
Files 152 152
Lines 16452 16485 +33
==========================================
+ Hits 8051 8058 +7
- Misses 7425 7450 +25
- Partials 976 977 +1 |
kolyshkin
reviewed
Mar 27, 2024
36bf1b4 to
67638d4
Compare
kolyshkin
reviewed
Mar 27, 2024
There was a problem hiding this comment.
Hmm, I was thinking cri-o maintains a list of running execs per container somewhere, at least those with a terminals, as it has to read from those terminals (doing that in a separate goroutine I guess). Can we reuse that list?
(and yes, we don't have to kill all execs, just those with a terminal, although that's not important)
67638d4 to
fa7e972
Compare
yeah right it's in a separate goroutine, and even the context diverges between the different CRI calls, so wiring them together would be tricky. |
kolyshkin
reviewed
Mar 28, 2024
fa7e972 to
705513d
Compare
kolyshkin
reviewed
Apr 16, 2024
kolyshkin
reviewed
Apr 16, 2024
0932325 to
ee8e9d2
Compare
ee8e9d2 to
ac1689d
Compare
|
@cri-o/cri-o-maintainers this is ready, PTAL |
|
/retest |
1 similar comment
|
/retest |
rphillips
reviewed
Apr 23, 2024
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, kwilczynski 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 |
|
/cherry-pick release-1.29 |
|
@haircommander: new pull request created: #8072 In response to this:
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/test-infra repository. |
|
@haircommander, anything against cherry-picks to releases from 1.28 to 1.25? I will be happy to do it manually, if needed. |
|
nothing at all, sounds good! |
|
/cherry-pick release-1.28 |
|
@kwilczynski: #7937 failed to apply on top of branch "release-1.28": In response to this:
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/test-infra repository. |
|
OK. Needs a manual cherry-pick. No worries. |
This was referenced Apr 30, 2024
Merged
Merged
Merged
saschagrunert
added a commit
to saschagrunert/cri-o
that referenced
this pull request
May 10, 2024
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 <[email protected]>
saschagrunert
added a commit
to saschagrunert/cri-o
that referenced
this pull request
May 10, 2024
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 <[email protected]>
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/cri-o
that referenced
this pull request
May 15, 2024
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 <[email protected]>
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/cri-o
that referenced
this pull request
May 15, 2024
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 <[email protected]>
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/cri-o
that referenced
this pull request
May 15, 2024
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 <[email protected]>
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/cri-o
that referenced
this pull request
May 15, 2024
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 <[email protected]>
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/cri-o
that referenced
this pull request
May 15, 2024
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 <[email protected]>
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/cri-o
that referenced
this pull request
May 15, 2024
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 <[email protected]>
github-actions bot
pushed a commit
that referenced
this pull request
Jun 1, 2024
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 #7937 Needs a cherry-pick since the enhancement got already backported into supported release branches. Signed-off-by: Sascha Grunert <[email protected]>
github-actions bot
pushed a commit
that referenced
this pull request
Jun 1, 2024
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 #7937 Needs a cherry-pick since the enhancement got already backported into supported release branches. Signed-off-by: Sascha Grunert <[email protected]>
github-actions bot
pushed a commit
that referenced
this pull request
Jun 1, 2024
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 #7937 Needs a cherry-pick since the enhancement got already backported into supported release branches. Signed-off-by: Sascha Grunert <[email protected]>
sohankunkerkar
pushed a commit
to sohankunkerkar/cri-o
that referenced
this pull request
Jul 17, 2024
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 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind bug
What this PR does / why we need it:
Which issue(s) this PR fixes:
Special notes for your reviewer:
Does this PR introduce a user-facing change?