Skip to content

bug fix:#3448#3449

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
YLonely:container-delete-bug
Jul 29, 2019
Merged

bug fix:#3448#3449
crosbymichael merged 1 commit intocontainerd:masterfrom
YLonely:container-delete-bug

Conversation

@YLonely
Copy link
Copy Markdown
Contributor

@YLonely YLonely commented Jul 24, 2019

fix issue #3448

Signed-off-by: BoWen Yan [email protected]

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 24, 2019

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 24, 2019

Build succeeded.

Comment thread container.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

There are situations where the snapshot is not named after the container id. This change looks good but we should change this so that we don't use the exact snapshot name

@codecov-io
Copy link
Copy Markdown

codecov-io commented Jul 24, 2019

Codecov Report

Merging #3449 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3449   +/-   ##
=======================================
  Coverage   44.22%   44.22%           
=======================================
  Files         124      124           
  Lines       13724    13724           
=======================================
  Hits         6070     6070           
  Misses       6723     6723           
  Partials      931      931
Flag Coverage Δ
#linux 48.01% <ø> (ø) ⬆️
#windows 39.88% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ab78270...e3cc9c2. Read the comment docs.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 25, 2019

Build succeeded.

@crosbymichael
Copy link
Copy Markdown
Member

After looking at this more, I think it would be better to move the errdefs.IsNotFound to https://github.com/containerd/containerd/blob/master/container_opts.go#L174

That way, we do not need to have the string check for "snapshot". Can you make this change?

@YLonely
Copy link
Copy Markdown
Contributor Author

YLonely commented Jul 26, 2019

After looking at this more, I think it would be better to move the errdefs.IsNotFound to https://github.com/containerd/containerd/blob/master/container_opts.go#L174

That way, we do not need to have the string check for "snapshot". Can you make this change?

so what you mean is that if the error type is IsNotFound in function WithSnapshotCleanup, we just ignore the error and return nil ?

@crosbymichael
Copy link
Copy Markdown
Member

@YLonely Yes. Exactly that

Signed-off-by: BoWen Yan <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 26, 2019

Build succeeded.

Copy link
Copy Markdown
Member

@mxpv mxpv left a comment

Choose a reason for hiding this comment

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

LGTM

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit fbca688 into containerd:master Jul 29, 2019
@crosbymichael
Copy link
Copy Markdown
Member

Thanks!

@YLonely YLonely deleted the container-delete-bug branch July 31, 2019 03:07
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.

4 participants