Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@kwilczynski
Copy link
Contributor

@kwilczynski kwilczynski commented Feb 13, 2024

This is a manual cherry-pick of #7726

/kind bug
/assign kwilczynski

Restore infra containers state on CRI-O restart. Without this, the infra containers will be accounted as missing, leading to a spurious error message.

@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Feb 13, 2024
@openshift-ci openshift-ci bot requested review from QiWang19 and klihub February 13, 2024 04:51

// Then
Expect(err).To(BeNil())
Expect(sut.GetInfraContainer(sandboxID)).NotTo(BeNil())
Copy link
Contributor Author

Choose a reason for hiding this comment

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

To the reviewer:

Updated for CRI-O 1.25 to resolve the following function signature difference:

# github.com/cri-o/cri-o/internal/lib_test [github.com/cri-o/cri-o/internal/lib.test]
./container_server_test.go:169:55: too many arguments in call to sut.GetInfraContainer
	have ("context".Context, string)
	want (string)

}

// We should restore the infraContainer to the container state store
c.AddInfraContainer(scontainer)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

To the reviewer:

Updated for CRI-O 1.25 to resolve the following function signature difference:

# github.com/cri-o/cri-o/internal/lib
Error: internal/lib/container_server.go:285:27: too many arguments in call to c.AddInfraContainer
	have (context.Context, *oci.Container)
	want (*oci.Container)

@kwilczynski kwilczynski changed the title When crio restarts, restore the infraContainer [release-1.25] When crio restarts, restore the infraContainer Feb 13, 2024
@kwilczynski
Copy link
Contributor Author

/approve
/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 13, 2024

@kwilczynski: you cannot LGTM your own PR.

Details

In response to this:

/approve
/lgtm

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.

@codecov
Copy link

codecov bot commented Feb 13, 2024

Codecov Report

Merging #7773 (a46b42e) into release-1.25 (4798e52) will increase coverage by 0.00%.
Report is 1 commits behind head on release-1.25.
The diff coverage is 100.00%.

Additional details and impacted files
@@              Coverage Diff              @@
##           release-1.25    #7773   +/-   ##
=============================================
  Coverage         43.61%   43.62%           
=============================================
  Files               122      122           
  Lines             13708    13709    +1     
=============================================
+ Hits               5979     5980    +1     
  Misses             7091     7091           
  Partials            638      638           

@kwilczynski
Copy link
Contributor Author

/retest-required

@kwilczynski
Copy link
Contributor Author

@cri-o/cri-o-maintainers, please have a look. Thank you!

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.

/hold

Feel free to unhold when the backport is ready to go.

@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 Feb 13, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 13, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 13, 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

Details 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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 13, 2024
@kwilczynski
Copy link
Contributor Author

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 13, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 1b1a520 into cri-o:release-1.25 Feb 13, 2024
@kwilczynski kwilczynski deleted the feature/cherry-pick-7726-to-release-1.25 branch February 13, 2024 11:40
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

Development

Successfully merging this pull request may close these issues.

3 participants