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

enlarge timeout when pouch start #2988

Merged
merged 1 commit into from
Oct 21, 2019

Conversation

zhuangqh
Copy link
Contributor

Ⅰ. 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
Copy link

codecov bot commented Oct 18, 2019

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%) ⬇️
#integration_test_0 36.13% <10.52%> (-0.02%) ⬇️
#integration_test_1 35.53% <10.52%> (+0.11%) ⬆️
#integration_test_2 36.09% <10.52%> (+0.02%) ⬆️
#integration_test_3 35.63% <10.52%> (+0.17%) ⬆️
#node_e2e_test 34% <10.52%> (-0.07%) ⬇️
#unittest 27.88% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
ctrd/container.go 51.2% <0%> (-0.48%) ⬇️
ctrd/supervisord/daemon.go 50.67% <100%> (ø) ⬆️
apis/server/utils.go 71.15% <0%> (-3.85%) ⬇️
pkg/meta/store.go 67.44% <0%> (-1.56%) ⬇️
daemon/mgr/container_utils.go 76.76% <0%> (-1.02%) ⬇️
cri/v1alpha2/cri.go 62.81% <0%> (-0.26%) ⬇️
ctrd/watch.go 78.37% <0%> (+5.4%) ⬆️

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

Signed-off-by: Ace-Tang <aceapril@126.com>
@zhuangqh zhuangqh requested a review from fuweid October 21, 2019 08:01
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 1b59eac into AliyunContainerService:master Oct 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants