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

Fix: fillout missing health check timeout on health check. #4185

Merged

Conversation

Colstuwjx
Copy link
Contributor

What this PR does / why we need it:

This PR fixes the missing flag argument HealthCheckTimeout which is removed in this commit by mistake, and keeps the default timeout settings ( 10s ) where it's NOT health check related calls.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

@k8s-ci-robot
Copy link
Contributor

Welcome @Colstuwjx!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 11, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @Colstuwjx. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 11, 2019
@Colstuwjx
Copy link
Contributor Author

I signed it

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 11, 2019
@Colstuwjx
Copy link
Contributor Author

/assign @aledbf

internal/nginx/main.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 12, 2019
@aledbf
Copy link
Member

aledbf commented Jun 12, 2019

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 12, 2019
internal/nginx/main.go Outdated Show resolved Hide resolved
@codecov-io
Copy link

codecov-io commented Jun 12, 2019

Codecov Report

Merging #4185 into master will increase coverage by 0.27%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4185      +/-   ##
==========================================
+ Coverage   57.46%   57.74%   +0.27%     
==========================================
  Files          87       87              
  Lines        6534     6480      -54     
==========================================
- Hits         3755     3742      -13     
+ Misses       2344     2307      -37     
+ Partials      435      431       -4
Impacted Files Coverage Δ
internal/ingress/controller/controller.go 46.5% <ø> (ø) ⬆️
cmd/nginx/flags.go 88.5% <100%> (+0.06%) ⬆️
internal/ingress/annotations/class/main.go 71.42% <0%> (ø) ⬆️
cmd/nginx/main.go 6.71% <0%> (+0.13%) ⬆️
internal/ingress/controller/store/store.go 61.75% <0%> (+0.49%) ⬆️
...ternal/ingress/annotations/sessionaffinity/main.go 55.26% <0%> (+1.6%) ⬆️
internal/ingress/status/status.go 73.18% <0%> (+4.73%) ⬆️
internal/k8s/main.go 84.21% <0%> (+23.83%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8cee8d5...b28577a. Read the comment docs.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 12, 2019
cmd/nginx/flags.go Outdated Show resolved Hide resolved
cmd/nginx/flags.go Outdated Show resolved Hide resolved
}
u.RegisterLocation(statusLocation, StatusSocket)

return &http.Client{
Transport: u,
}
}

func getOrSetUnixSocketClient() *http.Client {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this and just use buildUnixSocketClient(HealthCheckTimeout).Post(.....

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why? the socketClient is gloabl variable in the previous, call buildUnixSocketClient at each request would initial one client per request, it costs memory which is valueless.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, things cleared, and I will appreciate if you share with me the reason about code in this way :) @aledbf

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 12, 2019
@Colstuwjx
Copy link
Contributor Author

/retest

@aledbf
Copy link
Member

aledbf commented Jun 13, 2019

@Colstuwjx please squash the commits

@Colstuwjx Colstuwjx force-pushed the fix/missing-healthcheck-timeout branch from fd0aa62 to 18da0b3 Compare June 13, 2019 07:06
@Colstuwjx
Copy link
Contributor Author

@aledbf It seems that all things cleared, let me know if there are any issues left.

internal/nginx/main.go Outdated Show resolved Hide resolved
@Colstuwjx Colstuwjx force-pushed the fix/missing-healthcheck-timeout branch from 18da0b3 to b28577a Compare June 13, 2019 13:16
@aledbf
Copy link
Member

aledbf commented Jun 13, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 13, 2019
@aledbf
Copy link
Member

aledbf commented Jun 13, 2019

@Colstuwjx thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, Colstuwjx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 13, 2019
@k8s-ci-robot k8s-ci-robot merged commit ec674aa into kubernetes:master Jun 13, 2019
@Colstuwjx Colstuwjx deleted the fix/missing-healthcheck-timeout branch March 24, 2020 11:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants