dnsproxy: Fix bug where DNS request timed out too soon #31999
Merged
Conversation
This file contains hidden or 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
8b9bb6d to
fd87f5b
Compare
|
/test |
|
Putting back into draft. Local testing revealed that seems to be an issue in |
This pulls in cilium/dns#11 which fixes a bug where the `SharedClient` logic did not respect the `c.Client.Timeout` field. Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
This fixes a bug where DNS requests would timeout after 2 seconds, instead of the intended 10 seconds. This resulted in a `Timeout waiting for response to forwarded proxied DNS lookup` error message whenever the response took longer than 2 seconds. The `dns.Client` used by the proxy is [already configured][1] to use `ProxyForwardTimeout` value of 10 seconds, which would apply also to the `dns.Client.DialTimeout`, if it was not for the custom `net.Dialer` we use in Cilium. The logic in [dns.Client.getTimeoutForRequest][2] overwrites the request timeout with the timeout from the custom `Dialer`. Therefore, the intended `ProxyForwardTimeout` 10 second timeout value was overwritten with the much shorter `net.Dialer.Timeout` value of two seconds. This commit fixes that issue by using `ProxyForwardTimeout` for the `net.Dialer` too. Fixes: cf3cc16 ("fqdn: dnsproxy: fix forwarding of the original security identity for TCP") [1]: https://github.com/cilium/cilium/blob/50943dbc02496c42a4375947a988fc233417e163/pkg/fqdn/dnsproxy/proxy.go#L1042 [2]: https://github.com/cilium/cilium/blob/94f6553f5b79383b561e8630bdf40bd824769ede/vendor/github.com/cilium/dns/client.go#L405 Reported-by: Andrii Iuspin <andrii.iuspin@isovalent.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
fd87f5b to
2256e10
Compare
Fixed the bug in In manual testing, DNS timeouts now actually take 10 seconds again (where as without either commits, they time out after 2 seconds): |
|
/test |
rolinh
approved these changes
Apr 22, 2024
|
I need a review from a current |
sayboras
approved these changes
Apr 22, 2024
This was referenced May 10, 2024
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.
This fixes a bug where DNS requests would timeout after 2 seconds, instead of the intended 10 seconds. This resulted in a
Timeout waiting for response to forwarded proxied DNS lookuplog message whenver the response took longer than 2 seconds.The
dns.Clientused by the proxy is already configured to useProxyForwardTimeoutvalue of 10 seconds, which would apply also to thedns.Client.DialTimeout, if it was not for the customnet.Dialerwe use in Cilium. The logic in dns.Client.getTimeoutForRequest overwrites the request timeout with the timeout from the customDialer. Therefore, the intendedProxyForwardTimeout10 second timeout value was overwritten with the much shorternet.Dialer.Timeoutvalue of two seconds. This commit fixes that issue by usingProxyForwardTimeoutfor thenet.Dialertoo.Fixes: cf3cc16 ("fqdn: dnsproxy: fix forwarding of the original security identity for TCP")
Reported-by: @ayuspin
Backporting because the above commit was backported all the way to v1.11.