Skip to content

Conversation

@rudyfly
Copy link
Collaborator

@rudyfly rudyfly commented Jan 10, 2019

Ⅰ. Describe what this PR did

sometime, sleep 0.01s in container maybe not stopped
after sleep 2s in host, so restart container will be failed.

Ⅱ. Does this pull request fix one issue?

NONE

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

NA

Ⅳ. Describe how to verify it

ci pass

Ⅴ. Special notes for reviews

Signed-off-by: Rudy Zhang [email protected]

@rudyfly rudyfly requested review from allencloud and fuweid January 10, 2019 09:24
@codecov
Copy link

codecov bot commented Jan 10, 2019

Codecov Report

Merging #2658 into master will decrease coverage by 0.11%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2658      +/-   ##
==========================================
- Coverage   69.61%   69.49%   -0.12%     
==========================================
  Files         283      283              
  Lines       18900    18900              
==========================================
- Hits        13157    13135      -22     
- Misses       4269     4287      +18     
- Partials     1474     1478       +4
Flag Coverage Δ
#criv1alpha1test 31.52% <ø> (-0.01%) ⬇️
#criv1alpha2test 35.73% <ø> (+0.01%) ⬆️
#integrationtest 41.68% <ø> (-0.09%) ⬇️
#nodee2etest 32.81% <ø> (-0.13%) ⬇️
#unittest 26.93% <ø> (ø) ⬆️
Impacted Files Coverage Δ
cri/ocicni/cni_manager.go 58.82% <0%> (-11.77%) ⬇️
daemon/mgr/system.go 67.93% <0%> (-5.35%) ⬇️
ctrd/watch.go 80.28% <0%> (-4.23%) ⬇️
daemon/mgr/events.go 96.29% <0%> (-3.71%) ⬇️
ctrd/client.go 64.04% <0%> (-1.69%) ⬇️
cri/v1alpha2/cri.go 67.2% <0%> (-0.5%) ⬇️
ctrd/container.go 58.89% <0%> (-0.4%) ⬇️
daemon/mgr/container.go 59% <0%> (-0.22%) ⬇️
cri/v1alpha1/cri.go 60.09% <0%> (+0.33%) ⬆️
cri/v1alpha2/cri_wrapper.go 65.59% <0%> (+1.19%) ⬆️
... and 1 more

sometime, sleep 0.01s in container maybe not stopped
after sleep 2s in host, so restart container will be failed.

Signed-off-by: Rudy Zhang <[email protected]>
@HusterWan
Copy link
Contributor

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Jan 10, 2019
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 3997e54 into AliyunContainerService:master Jan 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

areas/test 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.

4 participants