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: not remove the metadata when remove container failed #2348

Merged
merged 1 commit into from
Oct 23, 2018

Conversation

starnop
Copy link
Contributor

@starnop starnop commented Oct 23, 2018

Signed-off-by: Starnop [email protected]

Ⅰ. Describe what this PR did

We should not remove the sandbox container metadata from sandboxStore until it was removed by pouchd. If that happend, there will be uncontrolled containers, it's not make sense. CRI is responsible for the life cycle of all the containers it creates and ensure consistency of container states.

Ⅱ. Does this pull request fix one issue?

None.

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

None.

Ⅳ. Describe how to verify it

none

Ⅴ. Special notes for reviews

none

@codecov
Copy link

codecov bot commented Oct 23, 2018

Codecov Report

Merging #2348 into master will increase coverage by 12.33%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #2348       +/-   ##
===========================================
+ Coverage    55.6%   67.93%   +12.33%     
===========================================
  Files         265      265               
  Lines       18208    18209        +1     
===========================================
+ Hits        10124    12370     +2246     
+ Misses       6889     4407     -2482     
- Partials     1195     1432      +237
Flag Coverage Δ
#criv1alpha1test 31.34% <0%> (-0.26%) ⬇️
#criv1alpha2test 35.45% <0%> (?)
#integrationtest 39.47% <0%> (+0.67%) ⬆️
#nodee2etest 32.86% <100%> (-0.18%) ⬇️
#unittest 25.31% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
cri/v1alpha2/cri.go 67.71% <100%> (+2.09%) ⬆️
cri/ocicni/cni_manager.go 59.18% <0%> (-12.25%) ⬇️
ctrd/watch.go 78.78% <0%> (-4.55%) ⬇️
daemon/mgr/snapshot.go 89.85% <0%> (-4.35%) ⬇️
apis/server/utils.go 71.15% <0%> (-3.85%) ⬇️
pkg/meta/store.go 62.5% <0%> (-1.57%) ⬇️
cri/v1alpha1/cri.go 60.38% <0%> (-0.65%) ⬇️
daemon/mgr/container_utils.go 82.82% <0%> (ø) ⬆️
storage/volume/driver/driver.go 68.03% <0%> (+1.63%) ⬆️
daemon/mgr/spec_mount.go 84.11% <0%> (+1.86%) ⬆️
... and 86 more

@pouchrobot pouchrobot added kind/bug This is bug report for project size/XS labels Oct 23, 2018
@allencloud
Copy link
Collaborator

Please add the reason why not to remove metadata in pull request description. @starnop
Thanks.

@starnop
Copy link
Contributor Author

starnop commented Oct 23, 2018

@allencloud has been added. :)

@allencloud
Copy link
Collaborator

that is so great. @starnop
LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Oct 23, 2018
@allencloud allencloud merged commit a0376b3 into AliyunContainerService:master Oct 23, 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 LGTM one maintainer or community participant agrees to merge the pull reuqest. size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants