fix: invalidated config should retain error #1068
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When a TLS handshake fails, the client would invalidate the configuration without recording the associated error. When the liveness check runs, it would panic when trying to print the invalidated configuration's error because the error was nil. This commit ensures that when the proxy invalidates a configuration, it includes the error. Fixes #1065.
enocom
force-pushed
the
healthcheck-fix
branch
from
b7b8025 to
7db7142
Compare
kurtisvg
suggested changes
Jan 14, 2022
kurtisvg
approved these changes
Jan 20, 2022
proxy/proxy/connect_tls_117.go
Outdated
| @@ -38,7 +39,8 @@ func (c *Client) connectTLS( | |||
| // this file is conditionally compiled on only Go versions >= 1.17. | |||
| if err := ret.HandshakeContext(ctx); err != nil { | |||
| _ = ret.Close() | |||
| c.invalidateCfg(cfg, instance) | |||
| err = fmt.Errorf("config invalidated after TLS handshake failed, error = %w", err) | |||
There was a problem hiding this comment.
nit: consider moving the wrapping to add context ("config invalidated because error:") inside the invalidate function
There was a problem hiding this comment.
Good idea. Should have thought of that myself.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a TLS handshake fails, the client would invalidate the
configuration without recording the associated error. When the liveness
check runs, it would panic when trying to print the invalidated
configuration's error because the error was nil. This commit ensures
that when the proxy invalidates a configuration, it includes the error.
Fixes #1065.