Skip to content
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.

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

Ignore not only auto-removed containers but also "removal in progress" for orphan containers #10136

Merged
merged 1 commit into from Jan 3, 2023

Conversation

gtardif
Copy link
Contributor

@gtardif gtardif commented Jan 3, 2023

Signed-off-by: Guillaume Tardif guillaume.tardif@gmail.com

What I did

Ignore not only "not found" errors but also "conflict" raised when a removal is already in progress (cf https://github.com/moby/moby/blob/master/errdefs/helpers.go#L62)

I came across this race condition with an extension that creates several orphan containers in a compose stack, some where happily removed (removal happened before compose tried to delete them), some failed (not always the same ones) with Error while Removing Error response from daemon: removal of container e7618297f985543d4df534179a843a9aa474645d6b7d6f436ce3568c592692bc is already in progress

Related issue
This should improve #9896

(not mandatory) A picture of a cute animal, if possible in relation to what you did
image

…" for orphan containers

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
@gtardif gtardif requested a review from glours January 3, 2023 10:19
Copy link
Contributor

@glours glours left a comment

Choose a reason for hiding this comment

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

LGTM

@glours glours enabled auto-merge January 3, 2023 10:21
@codecov
Copy link

codecov bot commented Jan 3, 2023

Codecov Report

Base: 74.26% // Head: 73.89% // Decreases project coverage by -0.36% ⚠️

Coverage data is based on head (37d15d7) compared to base (a224780).
Patch has no changes to coverable lines.

Additional details and impacted files
@@            Coverage Diff             @@
##               v2   #10136      +/-   ##
==========================================
- Coverage   74.26%   73.89%   -0.37%     
==========================================
  Files           2        2              
  Lines         272      272              
==========================================
- Hits          202      201       -1     
- Misses         59       60       +1     
  Partials       11       11              
Impacted Files Coverage Δ
pkg/e2e/framework.go 72.15% <0.00%> (-0.40%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@glours glours merged commit dcbd68a into docker:v2 Jan 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants