chore: better dns background fetch retrying

This commit is contained in:
wwqgtxx 2022-11-12 18:29:19 +08:00
parent 901a47318d
commit 75d339392b

View file

@ -149,6 +149,16 @@ func (r *Resolver) ExchangeContext(ctx context.Context, m *D.Msg) (msg *D.Msg, e
if len(m.Question) == 0 { if len(m.Question) == 0 {
return nil, errors.New("should have one question at least") return nil, errors.New("should have one question at least")
} }
continueFetch := false
defer func() {
if continueFetch || errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) {
ctx, cancel := context.WithTimeout(context.Background(), resolver.DefaultDNSTimeout)
defer cancel()
go func() {
_, _ = r.exchangeWithoutCache(ctx, m) // ignore result, just for putMsgToCache
}()
}
}()
q := m.Question[0] q := m.Question[0]
cacheM, expireTime, hit := r.lruCache.GetWithExpire(q.String()) cacheM, expireTime, hit := r.lruCache.GetWithExpire(q.String())
@ -157,7 +167,7 @@ func (r *Resolver) ExchangeContext(ctx context.Context, m *D.Msg) (msg *D.Msg, e
msg = cacheM.Copy() msg = cacheM.Copy()
if expireTime.Before(now) { if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(ctx, m) continueFetch = true
} else { } else {
setMsgTTL(msg, uint32(time.Until(expireTime).Seconds())) setMsgTTL(msg, uint32(time.Until(expireTime).Seconds()))
} }