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

add timeout for curl to prevent from hanging #2169

Merged
merged 1 commit into from
Aug 29, 2018

Conversation

sunyuan3
Copy link
Contributor

Signed-off-by: Yuan Sun [email protected]

Ⅰ. Describe what this PR did

In centos7.2, "curl localhost:9999" hangs. This PR is to prevent from hanging.

Ⅱ. Does this pull request fix one issue?

Yes

Ⅲ. Why don't you add test cases (unit test/integration test)?

This PR fixed the test case issue.

Ⅳ. Describe how to verify it

add timeout command

Ⅴ. Special notes for reviews

NA

@codecov-io
Copy link

codecov-io commented Aug 29, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2169      +/-   ##
==========================================
- Coverage    64.3%   64.26%   -0.05%     
==========================================
  Files         209      209              
  Lines       16725    16725              
==========================================
- Hits        10755    10748       -7     
- Misses       4639     4644       +5     
- Partials     1331     1333       +2
Flag Coverage Δ
#criv1alpha1test 32.94% <ø> (+0.01%) ⬆️
#criv1alpha2test 33.56% <ø> (-0.06%) ⬇️
#integrationtest 39.22% <ø> (+0.02%) ⬆️
#unittest 23.9% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/image.go 75% <0%> (-3.95%) ⬇️
cri/v1alpha2/cri.go 63.71% <0%> (-0.33%) ⬇️
daemon/mgr/container.go 56.77% <0%> (ø) ⬆️
daemon/mgr/system.go 79.33% <0%> (+1.65%) ⬆️
apis/server/utils.go 66.66% <0%> (+4.76%) ⬆️

@allencloud
Copy link
Collaborator

LGTM

@allencloud allencloud merged commit 199ad23 into AliyunContainerService:master Aug 29, 2018
@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Aug 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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