Sync to upstream #3001

fuweid · 2019-11-20T02:29:31Z

Ⅰ. Describe what this PR did

sync several improvement patches :

always take over the standard output of shim just in case that the shim is hang for log
try to unpack the image if the pulling action does not finish normally

Ⅱ. Does this pull request fix one issue?

no

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)

added it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Signed-off-by: Wei Fu <fuweid89@gmail.com>

PouchContainer always unpacks for pulled images. But if there is any crash or terminated, the unpack action will be stopped. And image metadata is stored in containerd. It will cause that the following create container request fails. Try to unpack it if fail. Signed-off-by: Wei Fu <fuweid89@gmail.com>

Signed-off-by: Wei Fu <fuweid89@gmail.com>

And also add testing common conf for new test case. Signed-off-by: Wei Fu <fuweid89@gmail.com>

codecov · 2019-11-20T02:29:33Z

Codecov Report

Merging #3001 into master will increase coverage by 7.61%.
The diff coverage is 50%.

@@            Coverage Diff             @@
##           master    #3001      +/-   ##
==========================================
+ Coverage   60.45%   68.06%   +7.61%     
==========================================
  Files         291      291              
  Lines       18669    18687      +18     
==========================================
+ Hits        11286    12719    +1433     
+ Misses       5994     4486    -1508     
- Partials     1389     1482      +93

Flag	Coverage Δ
#criv1alpha2_test	`34.51% <50%> (-0.03%)`	⬇️
#integration_test_0	`36.36% <50%> (-63.64%)`	⬇️
#integration_test_1	`35.99% <50%> (-64.01%)`	⬇️
#integration_test_2	`36.32% <50%> (-63.68%)`	⬇️
#integration_test_3	`35.83% <50%> (+0.01%)`	⬆️
#node_e2e_test	`34.23% <50%> (+0.24%)`	⬆️
#unittest	`26.64% <0%> (-0.03%)`	⬇️

Impacted Files	Coverage Δ
daemon/daemon.go	`67.82% <100%> (ø)`	⬆️
ctrd/snapshot.go	`50.66% <47.61%> (-5.48%)`	⬇️
cri/v1alpha2/cri.go	`61.33% <0%> (+0.24%)`	⬆️
daemon/logger/jsonfile/utils.go	`71.54% <0%> (+0.81%)`	⬆️
ctrd/supervisord/daemon.go	`49.12% <0%> (+1.31%)`	⬆️
registry/auth.go	`55.14% <0%> (+1.86%)`	⬆️
ctrd/client.go	`64.31% <0%> (+1.87%)`	⬆️
pkg/utils/utils.go	`83.26% <0%> (+2.04%)`	⬆️
apis/filters/parse.go	`83.15% <0%> (+2.1%)`	⬆️
ctrd/image.go	`69.11% <0%> (+2.57%)`	⬆️
... and 64 more

zhuangqh

LGTM

fuweid added 4 commits November 19, 2019 20:26

open debug mode to take over shim standard output

bb34eb2

Signed-off-by: Wei Fu <fuweid89@gmail.com>

test: add test to check snapshotter holder

2ff6f87

Signed-off-by: Wei Fu <fuweid89@gmail.com>

ctrd: fix naming issue original_ctx -> originalCtx

f7f39df

And also add testing common conf for new test case. Signed-off-by: Wei Fu <fuweid89@gmail.com>

zhuangqh approved these changes Nov 20, 2019

View reviewed changes

zhuangqh merged commit d5746d1 into AliyunContainerService:master Nov 20, 2019

fuweid deleted the sync-to-upstream branch November 20, 2019 06:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync to upstream #3001

Sync to upstream #3001

fuweid commented Nov 20, 2019

codecov bot commented Nov 20, 2019 •

edited

Loading

zhuangqh left a comment

Sync to upstream #3001

Sync to upstream #3001

Conversation

fuweid commented Nov 20, 2019

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov bot commented Nov 20, 2019 • edited Loading

Codecov Report

zhuangqh left a comment

Choose a reason for hiding this comment

codecov bot commented Nov 20, 2019 •

edited

Loading