From c315d21be9bcf778ecbacbca702220821b04a39f Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Fri, 16 Jun 2023 20:04:54 +0700 Subject: [PATCH] cmd/ctrld: do not retry failed query Most the client will retry failed request itself. Doing this on the server give no benefit, and could cause un-necessary load when the server is busy. --- cmd/ctrld/dns_proxy.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cmd/ctrld/dns_proxy.go b/cmd/ctrld/dns_proxy.go index 366fafb..776224f 100644 --- a/cmd/ctrld/dns_proxy.go +++ b/cmd/ctrld/dns_proxy.go @@ -244,15 +244,7 @@ func (p *prog) proxy(ctx context.Context, upstreams []string, failoverRcodes []i } } answer, err := resolve1(n, upstreamConfig, msg) - // Only do re-bootstrapping if bootstrap ip is not explicitly set by user. - if err != nil && upstreamConfig.BootstrapIP == "" { - ctrld.Log(ctx, mainLog.Debug().Err(err), "could not resolve query on first attempt, retrying...") - // If any error occurred, re-bootstrap transport/ip, retry the request. - upstreamConfig.ReBootstrap() - answer, err = resolve1(n, upstreamConfig, msg) - if err == nil { - return answer - } + if err != nil { ctrld.Log(ctx, mainLog.Error().Err(err), "failed to resolve query") return nil }