OS resolver retry should respect the leak_on_upstream_failure config option

This commit is contained in:
Alex
2025-02-18 20:25:26 +07:00
committed by Cuong Manh Le
parent dc433f8dc9
commit 7929aafe2a
+2 -1
View File
@@ -640,9 +640,9 @@ func (p *prog) proxy(ctx context.Context, req *proxyRequest) *proxyResponse {
} else { } else {
mainLog.Load().Debug().Msg("One upstream is down but at least one is healthy; skipping recovery trigger") mainLog.Load().Debug().Msg("One upstream is down but at least one is healthy; skipping recovery trigger")
} }
}
// attempt query to OS resolver while as a retry catch all // attempt query to OS resolver while as a retry catch all
// we dont want this to happen if leakOnUpstreamFailure is false
if upstreams[0] != upstreamOS { if upstreams[0] != upstreamOS {
ctrld.Log(ctx, mainLog.Load().Debug(), "attempting query to OS resolver as a retry catch all") ctrld.Log(ctx, mainLog.Load().Debug(), "attempting query to OS resolver as a retry catch all")
answer := resolve(upstreamOS, osUpstreamConfig, req.msg) answer := resolve(upstreamOS, osUpstreamConfig, req.msg)
@@ -654,6 +654,7 @@ func (p *prog) proxy(ctx context.Context, req *proxyRequest) *proxyResponse {
} }
ctrld.Log(ctx, mainLog.Load().Debug(), "OS resolver retry query failed") ctrld.Log(ctx, mainLog.Load().Debug(), "OS resolver retry query failed")
} }
}
answer := new(dns.Msg) answer := new(dns.Msg)
answer.SetRcode(req.msg, dns.RcodeServerFailure) answer.SetRcode(req.msg, dns.RcodeServerFailure)