AliyunContainerService / pouch

An Efficient Enterprise-class Container Engine
https://pouchcontainer.io
Apache License 2.0
4.64k stars 949 forks source link

enlarge timeout when pouch start #2988

Closed zhuangqh closed 5 years ago

zhuangqh commented 5 years ago

Ⅰ. Describe what this PR did

enlarge two timeout case:

  1. in recovery container, since some system is high, enlarge timeout and make 3 times retry
  2. check containerd grpc service is started, since task v2 service is start before grpc service, sometimes v2 shim is hang, get 5 second timeout here, so enlarge timeout in pouch

Ace-Tang aceapril@126.com

Ⅱ. 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 5 years ago

Codecov Report

Merging #2988 into master will decrease coverage by 0.04%. The diff coverage is 10.52%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2988      +/-   ##
==========================================
- Coverage   68.03%   67.99%   -0.05%     
==========================================
  Files         291      291              
  Lines       18384    18389       +5     
==========================================
- Hits        12508    12504       -4     
- Misses       4411     4419       +8     
- Partials     1465     1466       +1
Flag Coverage Δ
#criv1alpha2_test 34.72% <10.52%> (-0.04%) :arrow_down:
#integration_test_0 36.13% <10.52%> (-0.02%) :arrow_down:
#integration_test_1 35.53% <10.52%> (+0.11%) :arrow_up:
#integration_test_2 36.09% <10.52%> (+0.02%) :arrow_up:
#integration_test_3 35.63% <10.52%> (+0.17%) :arrow_up:
#node_e2e_test 34% <10.52%> (-0.07%) :arrow_down:
#unittest 27.88% <0%> (-0.01%) :arrow_down:
Impacted Files Coverage Δ
ctrd/container.go 51.2% <0%> (-0.48%) :arrow_down:
ctrd/supervisord/daemon.go 50.67% <100%> (ø) :arrow_up:
apis/server/utils.go 71.15% <0%> (-3.85%) :arrow_down:
pkg/meta/store.go 67.44% <0%> (-1.56%) :arrow_down:
daemon/mgr/container_utils.go 76.76% <0%> (-1.02%) :arrow_down:
cri/v1alpha2/cri.go 62.81% <0%> (-0.26%) :arrow_down:
ctrd/watch.go 78.37% <0%> (+5.4%) :arrow_up: