Skip to content

rootfs: use new ctx to cleanup instead of canceled one#3582

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
fuweid:me-cleanup-issue-CreateDiff
Aug 27, 2019
Merged

rootfs: use new ctx to cleanup instead of canceled one#3582
crosbymichael merged 1 commit intocontainerd:masterfrom
fuweid:me-cleanup-issue-CreateDiff

Conversation

@fuweid
Copy link
Copy Markdown
Member

@fuweid fuweid commented Aug 26, 2019

rootfs.CreateDiff might be canceled by context for some reason. Based on
this case, the defer function should use the new ctx to do cleanup
temporary snapshotter instead of the canceled one.

Signed-off-by: Wei Fu [email protected]

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 26, 2019

Build succeeded.

Comment thread rootfs/diff.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.

instead of todo, what about context.Background()? todo seems like there is still more work to be done

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

updated. I was thinking the todo has short name lol

@codecov-io
Copy link
Copy Markdown

codecov-io commented Aug 27, 2019

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3582   +/-   ##
=======================================
  Coverage   42.26%   42.26%           
=======================================
  Files         126      126           
  Lines       13881    13881           
=======================================
  Hits         5867     5867           
  Misses       7128     7128           
  Partials      886      886
Flag Coverage Δ
#linux 45.75% <ø> (ø) ⬆️
#windows 37.23% <ø> (ø) ⬆️

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 d618c80...09b184c. Read the comment docs.

rootfs.CreateDiff might be canceled by context for some reason. Based on
this case, the defer function should use the new ctx to do cleanup
temporary snapshotter instead of the canceled one.

Signed-off-by: Wei Fu <[email protected]>
@fuweid fuweid force-pushed the me-cleanup-issue-CreateDiff branch from d46921a to 09b184c Compare August 27, 2019 05:27
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 27, 2019

Build succeeded.

Copy link
Copy Markdown
Member

@estesp estesp 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 3096178 into containerd:master Aug 27, 2019
@fuweid fuweid deleted the me-cleanup-issue-CreateDiff branch August 27, 2019 14:22
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