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

Use a ten second timeout for join requests #4607

Merged
merged 2 commits into from
Jun 17, 2024

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jun 12, 2024

Description

This prevents k0s from hanging on idle network connections, such as random glitches, badly behaving load balancers, and so on.

Add a context to the JoinClient methods and call them with a context that times out after 10 seconds when joining a controller. This has the side effect that joining will also be interruptible by SIGTERM and Ctrl+C.

Fixes #4557.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

From the Godocs of http.Response:

> The http Client and Transport guarantee that Body is always non-nil,
> even on responses without a body or responses with a zero-length body.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
@twz123 twz123 added bug Something isn't working area/controlplane labels Jun 12, 2024
kke
kke previously approved these changes Jun 13, 2024
Copy link
Contributor

@kke kke left a comment

Choose a reason for hiding this comment

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

Looks proper

This prevents k0s from hanging on idle network connections, such as
random glitches, badly behaving load balancers, and so on.

Add a context to the JoinClient methods and call them with a context
that times out after 10 seconds when joining a controller. This has
the side effect that joining will also be interruptible by SIGTERM and
Ctrl+C.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
@twz123 twz123 force-pushed the join-client-hardening branch from 651c784 to dfb5031 Compare June 13, 2024 10:47
@twz123 twz123 marked this pull request as ready for review June 13, 2024 11:56
@twz123 twz123 requested a review from a team as a code owner June 13, 2024 11:56
@twz123 twz123 requested review from ncopa, juanluisvaladas and kke June 13, 2024 11:56
@twz123 twz123 merged commit 7f91d37 into k0sproject:main Jun 17, 2024
79 checks passed
@twz123 twz123 deleted the join-client-hardening branch June 17, 2024 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/controlplane bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

controller join not working with AWS NLB
3 participants