add support for custom dial function with timeouts #1669
Conversation
| // Note that if Dial is set instead of DialTimeout, Dial will ignore Request timeout. | ||
| // If you want the tcp dial process to account for request timeouts, use DialTimeout instead. | ||
| // | ||
| // If not set, DialTimeout is used. |
There was a problem hiding this comment.
we may consider deprecating this one if you feel like it.
I went with a less aggressive approach and just documented the difference between the two.
it may seem a bit confusing in terms of the difference between them though...
| @@ -1839,16 +1872,6 @@ func (c *HostClient) dialHostHard(dialTimeout time.Duration) (conn net.Conn, err | |||
| n = 1 | |||
| } | |||
|
|
|||
| dial := c.Dial | |||
There was a problem hiding this comment.
this block is removed in favor of the new callDialFunc function
| @@ -2591,7 +2626,7 @@ func (c *pipelineConnClient) init() { | |||
|
|
|||
| func (c *pipelineConnClient) worker() error { | |||
| tlsConfig := c.cachedTLSConfig() | |||
| conn, err := dialAddr(c.Addr, c.Dial, c.DialDualStack, c.IsTLS, tlsConfig, c.WriteTimeout) | |||
| conn, err := dialAddr(c.Addr, c.Dial, nil, c.DialDualStack, c.IsTLS, tlsConfig, 0, c.WriteTimeout) | |||
There was a problem hiding this comment.
to not overcomplicate the commit, i left PipelineClient as is - meaning although it does implement a DoTimeout function, it does not support passing it to the dial process and thus does not expose a DialWithTimeout param. Adding it could be quite complex due to the async nature of PipelineClient, the dial process might serve several different requests so to support it we might need to further design how exactly we want to act when we have several different timeouts on a single dial call.
If we do want to support it in PipelineClient, we can either address it in this PR or postpone it to later. I will need to understand how to support it here though
|
ugh, my bad. |
|
Thanks! |
No description provided.