oci: handle early exited container faster in stop loop

[haircommander]

if we hit a TOCTOU race with c.Living() and StopLoopForContainer, then we will be forced to wait until the kubelet re-requests. instead, update watchers immediately so this doesn't happen

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?

fix a bug where a container that exits soon after a StopContainer request is issued will be paused in termination for longer than the grace period

[codecov]

Codecov Report

Merging #7735 (e84b654) into main (5a2bbb9) will decrease coverage by 0.02%.
Report is 29 commits behind head on main.
The diff coverage is 21.40%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7735      +/-   ##
==========================================
- Coverage   47.97%   47.95%   -0.02%     
==========================================
  Files         145      146       +1     
  Lines       16268    16274       +6     
==========================================
  Hits         7804     7804              
+ Misses       7520     7517       -3     
- Partials      944      953       +9     

[sohankunkerkar]

/retest
/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, sohankunkerkar

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

[rphillips]

/cherry-pick release-1.29

[openshift-cherrypick-robot]

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

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.

[sohankunkerkar]

/retest

[openshift-cherrypick-robot]

@rphillips: new pull request created: #7737

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.

[sohankunkerkar]

/cherry-pick release-1.28

[openshift-cherrypick-robot]

@sohankunkerkar: new pull request created: #7738

In response to this:

/cherry-pick release-1.28

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.

[sohankunkerkar]

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

[openshift-cherrypick-robot]

@sohankunkerkar: new pull request created: #7739

In response to this:

/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]

@sohankunkerkar, you might need to kick off release-1.26 and release-1.25 again. I think it didn't pick on the edit to correct the slashes situation. 😄

[sohankunkerkar]

/cherry-pick release-1.26

[sohankunkerkar]

/cherry-pick release-1.25

[openshift-cherrypick-robot]

@sohankunkerkar: new pull request created: #7745

In response to this:

/cherry-pick release-1.26

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.

[openshift-cherrypick-robot]

@sohankunkerkar: new pull request created: #7746

In response to this:

/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.

[sohankunkerkar]

/cherry-pick release-1.24

[openshift-cherrypick-robot]

@sohankunkerkar: #7735 failed to apply on top of branch "release-1.24":

Applying: oci: handle early exited container faster in stop loop
Using index info to reconstruct a base tree...
M	internal/oci/container.go
M	internal/oci/runtime_oci.go
M	internal/oci/runtime_oci_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/oci/runtime_oci_test.go
CONFLICT (content): Merge conflict in internal/oci/runtime_oci_test.go
Auto-merging internal/oci/runtime_oci.go
CONFLICT (content): Merge conflict in internal/oci/runtime_oci.go
Auto-merging 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: handle early exited container faster in stop loop
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.24

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]

@sohankunkerkar, did someone ask for 1.24?

I think, it might be safe to stop at 1.25 at this point. We should be out of support for 1.24 since 1.29 came to be.

Also, among some of the users of 1.24 and 1.25, the OpenShift 4.10 and 4.11 is also officially out of support.

[sohankunkerkar]

Yeah, I realized that. I was under the impression that version 1.24 of cri-o is included in OCP 4.12. Thanks for the pointers.