Skip to content

Conversation

fidencio
Copy link
Contributor

What type of PR is this?

/kind bug

What this PR does / why we need it:

This reverts commit 67dcd05.

We cannot simply delete the container when its status changes to
stopped. The intention of this fix is okay-ish, but implemented in the
wrong layer.

What containerd does is calling Shutdown(), when the pod is finished,
and that's what we should do as well.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

This reverts commit 67dcd05.

We cannot simply delete the container when its status changes to
stopped. The intention of this fix is okay-ish, but implemented in the
wrong layer.

What containerd does is calling Shutdown(), when the *pod* is finished,
and that's what we should do as well.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
@openshift-ci-robot openshift-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. 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 Aug 31, 2020
@openshift-ci-robot
Copy link

@fidencio: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2 dd507bd link /test integration_cgroupv2
ci/openshift-jenkins/e2e_crun_cgroupv2 dd507bd link /test e2e_cgroupv2

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@codecov
Copy link

codecov bot commented Aug 31, 2020

Codecov Report

Merging #4145 into release-1.17 will increase coverage by 0.01%.
The diff coverage is n/a.

@@               Coverage Diff                @@
##           release-1.17    #4145      +/-   ##
================================================
+ Coverage         44.66%   44.68%   +0.01%     
================================================
  Files                90       90              
  Lines              7701     7698       -3     
================================================
  Hits               3440     3440              
+ Misses             3964     3961       -3     
  Partials            297      297              

Copy link
Member

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

LGTM

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fidencio, 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2020
@TomSweeneyRedHat
Copy link
Contributor

@fidencio you said we should call shutdown() when the pod is finished. I don't see that change here, is it already present?

@fidencio
Copy link
Contributor Author

fidencio commented Sep 1, 2020

@fidencio you said we should call shutdown() when the pod is finished. I don't see that change here, is it already present?

Tom, no, it's not. It'll be a follow up patch coming soon. Right now I just want to unblock the 1.17.5 release by reverting this commit.

@haircommander
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2020
@openshift-merge-robot openshift-merge-robot merged commit 6b97f81 into cri-o:release-1.17 Sep 1, 2020
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-none Denotes a PR that doesn't merit a release note.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants