Skip to content

[release 1.2] Fix cleanup error on content client test#3856

Merged
dmcgowan merged 1 commit intocontainerd:release/1.2from
fuweid:cp-1.2-3853
Nov 27, 2019
Merged

[release 1.2] Fix cleanup error on content client test#3856
dmcgowan merged 1 commit intocontainerd:release/1.2from
fuweid:cp-1.2-3853

Conversation

@fuweid
Copy link
Copy Markdown
Member

@fuweid fuweid commented Nov 27, 2019

A race occurs today where the cleanup runs after the lease
has been deleted, making all the content and statuses
eligible for collection during the cleanup. There is a case
where a status could be listed but removed before the
abort is called. In this case, abort will return a not found
and the test cleanup should ignore it.

Signed-off-by: Derek McGowan derek@mcgstyle.net
(cherry picked from commit 8da4346)
Signed-off-by: Wei Fu fuweid89@gmail.com

cherry-pick #3853

A race occurs today where the cleanup runs after the lease
has been deleted, making all the content and statuses
eligible for collection during the cleanup. There is a case
where a status could be listed but removed before the
abort is called. In this case, abort will return a not found
and the test cleanup should ignore it.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
(cherry picked from commit 8da4346)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
@codecov-io
Copy link
Copy Markdown

codecov-io commented Nov 27, 2019

Codecov Report

Merging #3856 into release/1.2 will decrease coverage by 3.67%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #3856      +/-   ##
===============================================
- Coverage        47.87%   44.19%   -3.68%     
===============================================
  Files               91      100       +9     
  Lines             8483    10847    +2364     
===============================================
+ Hits              4061     4794     +733     
- Misses            3688     5313    +1625     
- Partials           734      740       +6
Flag Coverage Δ
#linux 47.87% <ø> (ø) ⬆️
#windows 41% <ø> (?)
Impacted Files Coverage Δ
snapshots/native/native.go 43.3% <0%> (-10%) ⬇️
metadata/snapshot.go 45.8% <0%> (-8.96%) ⬇️
archive/tar.go 44.08% <0%> (-7.32%) ⬇️
metadata/containers.go 47.97% <0%> (-6.62%) ⬇️
content/local/writer.go 58.65% <0%> (-5.55%) ⬇️
content/local/store.go 48.51% <0%> (-5.03%) ⬇️
metadata/images.go 57.57% <0%> (-4.99%) ⬇️
archive/tar_opts.go 28.57% <0%> (-4.77%) ⬇️
archive/compression/compression.go 58.69% <0%> (-4.7%) ⬇️
metadata/buckets.go 56.33% <0%> (-4.6%) ⬇️
... and 57 more

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 f772c10...de8ed89. Read the comment docs.

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

Copy link
Copy Markdown
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan dmcgowan merged commit ec48c95 into containerd:release/1.2 Nov 27, 2019
@fuweid fuweid deleted the cp-1.2-3853 branch November 28, 2019 02:28
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