Skip to content

Remove entry for container from container store on error #8414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
fuweid merged 1 commit into from
Apr 26, 2023
Merged

Remove entry for container from container store on error #8414

fuweid merged 1 commit into from
Apr 26, 2023

Conversation

@kiashok
Copy link
Contributor

@kiashok kiashok commented Apr 18, 2023

If containerd does not see a container but criservice's container store does, then we should try to recover from this error state by removing the container from criservice's container store as well.

@k8s-ci-robot
Copy link

k8s-ci-robot commented Apr 18, 2023

Hi @kiashok. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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.

@kiashok kiashok force-pushed the deleteCtrFromCtrStore branch 4 times, most recently from 3139aaa to b17a05a Compare April 19, 2023 16:36
dcantah
dcantah reviewed Apr 20, 2023
View reviewed changes
dcantah
dcantah reviewed Apr 20, 2023
View reviewed changes
@kiashok kiashok force-pushed the deleteCtrFromCtrStore branch from b17a05a to 591bbd1 Compare April 20, 2023 21:17
@kiashok kiashok mentioned this pull request Apr 20, 2023
Closed
@kiashok
Copy link
Contributor Author

kiashok commented Apr 20, 2023

close #8425

@kiashok kiashok force-pushed the deleteCtrFromCtrStore branch from 591bbd1 to 2dd47ac Compare April 20, 2023 21:44
fuweid
fuweid reviewed Apr 25, 2023
View reviewed changes
Remove entry for container from container store on error
d9f3e38 
If containerd does not see a container but criservice's
container store does, then we should try to recover from
this error state by removing the container from criservice's
container store as well.

Signed-off-by: Kirtana Ashok <[email protected]>
@kiashok kiashok force-pushed the deleteCtrFromCtrStore branch from 2dd47ac to d9f3e38 Compare April 25, 2023 23:32
@kiashok
Copy link
Contributor Author

kiashok commented Apr 25, 2023

@fuweid addressed your review comment. Could you please take a look? Thanks!

fuweid
fuweid approved these changes Apr 26, 2023
View reviewed changes
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit b27301c into containerd:main Apr 26, 2023
@fuweid fuweid added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch labels May 5, 2023
This was referenced May 5, 2023
Merged
Merged
@AbelHu AbelHu mentioned this pull request Jun 29, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@fuweid fuweid fuweid approved these changes

@dcantah dcantah dcantah approved these changes

Assignees

No one assigned

Labels

cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch needs-ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@kiashok @k8s-ci-robot @dmcgowan @fuweid @dcantah