mirror of
https://github.com/Control-D-Inc/ctrld.git
synced 2026-04-20 00:36:37 +02:00
doq: use OpenStreamSync and retry on StreamLimitReachedError
Replace conn.OpenStream (non-blocking) with conn.OpenStreamSync so that the resolver waits for the server's MAX_STREAMS credit replenishment frame instead of immediately failing when the stream limit is temporarily exhausted. Also retry on StreamLimitReachedError as defense-in-depth for servers that are slow or fail to send MAX_STREAMS updates.
This commit is contained in:
committed by
Cuong Manh Le
parent
eaa171f66f
commit
ed98104384
@@ -91,8 +91,9 @@ func newDOQConnPool(uc *UpstreamConfig, addrs []string) *doqConnPool {
|
||||
|
||||
// Resolve performs a DNS query using a pooled QUIC connection.
|
||||
func (p *doqConnPool) Resolve(ctx context.Context, msg *dns.Msg) (*dns.Msg, error) {
|
||||
// Retry logic for transient errors: io.EOF (connection reset) and
|
||||
// IdleTimeoutError (stale pooled connection timed out).
|
||||
// Retry logic for transient errors: io.EOF (connection reset),
|
||||
// IdleTimeoutError (stale pooled connection timed out), and
|
||||
// StreamLimitReachedError (stream credit exhausted before server MAX_STREAMS arrived).
|
||||
for range 5 {
|
||||
answer, err := p.doResolve(ctx, msg)
|
||||
if err == io.EOF {
|
||||
@@ -102,6 +103,10 @@ func (p *doqConnPool) Resolve(ctx context.Context, msg *dns.Msg) (*dns.Msg, erro
|
||||
if errors.As(err, &idleErr) {
|
||||
continue
|
||||
}
|
||||
var streamLimitErr quic.StreamLimitReachedError
|
||||
if errors.As(err, &streamLimitErr) {
|
||||
continue
|
||||
}
|
||||
if err != nil {
|
||||
return nil, wrapCertificateVerificationError(err)
|
||||
}
|
||||
@@ -126,18 +131,25 @@ func (p *doqConnPool) doResolve(ctx context.Context, msg *dns.Msg) (*dns.Msg, er
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Open a new stream for this query
|
||||
stream, err := conn.OpenStream()
|
||||
// Ensure the context has a deadline before calling OpenStreamSync, which
|
||||
// blocks until the server sends a MAX_STREAMS update. Without a deadline the
|
||||
// call could block indefinitely when the server never sends the update.
|
||||
deadline, ok := ctx.Deadline()
|
||||
if !ok {
|
||||
var cancel context.CancelFunc
|
||||
ctx, cancel = context.WithTimeout(ctx, 5*time.Second)
|
||||
defer cancel()
|
||||
deadline, _ = ctx.Deadline()
|
||||
}
|
||||
|
||||
// OpenStreamSync blocks until the server's MAX_STREAMS credit arrives,
|
||||
// avoiding the StreamLimitReachedError race that OpenStream (non-blocking)
|
||||
// triggers when the credit replenishment frame is still in flight.
|
||||
stream, err := conn.OpenStreamSync(ctx)
|
||||
if err != nil {
|
||||
p.putConn(conn, false)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Set deadline
|
||||
deadline, ok := ctx.Deadline()
|
||||
if !ok {
|
||||
deadline = time.Now().Add(5 * time.Second)
|
||||
}
|
||||
_ = stream.SetDeadline(deadline)
|
||||
|
||||
// Write message length (2 bytes) followed by message
|
||||
|
||||
Reference in New Issue
Block a user