oci: keep track of exec PIDs and stop them on container stop

[haircommander]

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?

Keep track of exec calls for a container, and make sure to kill them when a container is being stopped

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[codecov]

Codecov Report

Merging #7937 (fa7e972) into main (01b30dd) will decrease coverage by 0.06%.
Report is 2 commits behind head on main.
The diff coverage is 18.18%.

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]

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)

[haircommander]

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)

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.

[haircommander]

@cri-o/cri-o-maintainers this is ready, PTAL

[haircommander]

/retest

[haircommander]

/retest

[kwilczynski]

/approve
/lgtm

[openshift-ci]

[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:

• OWNERS [haircommander]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[haircommander]

/cherry-pick release-1.29

[openshift-cherrypick-robot]

@haircommander: new pull request created: #8072

In response to this:

/cherry-pick release-1.29

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.

[kwilczynski]

@haircommander, anything against cherry-picks to releases from 1.28 to 1.25? I will be happy to do it manually, if needed.

[haircommander]

nothing at all, sounds good!

[kwilczynski]

/cherry-pick release-1.28
/cherry-pick release-1.27
/cherry-pick release-1.26
/cherry-pick release-1.25

[openshift-cherrypick-robot]

@kwilczynski: #7937 failed to apply on top of branch "release-1.28":

Applying: oci: keep track of exec PIDs and stop them on container stop
Using index info to reconstruct a base tree...
M	internal/oci/container.go
M	internal/oci/runtime_oci.go
M	test/ctr.bats
Falling back to patching base and 3-way merge...
Auto-merging test/ctr.bats
Auto-merging internal/oci/runtime_oci.go
CONFLICT (content): Merge conflict in internal/oci/runtime_oci.go
Auto-merging internal/oci/container.go
CONFLICT (content): Merge conflict in internal/oci/container.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 oci: keep track of exec PIDs and stop them on container stop
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.28
/cherry-pick release-1.27
/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/test-infra repository.

[kwilczynski]

OK. Needs a manual cherry-pick. No worries.