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

bugfix: return error when remove/stop containers of sandbox failed #2109

Merged
merged 1 commit into from
Aug 17, 2018

Conversation

YaoZengzeng
Copy link
Contributor

Signed-off-by: YaoZengzeng yaozengzeng@zju.edu.cn

Ⅰ. Describe what this PR did

When stop/remove the sandbox, we should stop/remove the containers of the sandbox as well.

However if we failed to stop/remove the containers, we should report the error to kubelet.

Otherwise if the sandbox is removed successfully and the containers are failed to be removed,

the containers will be left and never be cleaned.

Ⅱ. 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

Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
@pouchrobot pouchrobot added kind/bug This is bug report for project size/XS labels Aug 17, 2018
@codecov-io
Copy link

codecov-io commented Aug 17, 2018

Codecov Report

Merging #2109 into master will increase coverage by 0.02%.
The diff coverage is 75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2109      +/-   ##
==========================================
+ Coverage   65.11%   65.13%   +0.02%     
==========================================
  Files         208      208              
  Lines       16409    16413       +4     
==========================================
+ Hits        10685    10691       +6     
- Misses       4393     4395       +2     
+ Partials     1331     1327       -4
Flag Coverage Δ
#criv1alpha1test 33.34% <50%> (+0.12%) ⬆️
#criv1alpha2test 33.86% <25%> (-0.03%) ⬇️
#integrationtest 39.82% <0%> (-0.05%) ⬇️
#unittest 23.86% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
cri/v1alpha1/cri.go 64.13% <100%> (+0.29%) ⬆️
cri/v1alpha2/cri.go 64.63% <50%> (-0.05%) ⬇️
ctrd/image.go 75% <0%> (-2.2%) ⬇️
daemon/mgr/container.go 56.5% <0%> (+0.4%) ⬆️
ctrd/watch.go 80.3% <0%> (+4.54%) ⬆️

@YaoZengzeng
Copy link
Contributor Author

@fuweid @starnop PTAL

Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit be46d37 into AliyunContainerService:master Aug 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants