Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-31 10:13:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix healthy proxy error case (#5168)

Browse Source 
Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
This commit is contained in:
Chris O'Haver
2022-02-10 08:58:46 -05:00
committed by GitHub
parent 4064430f81
commit d6743531ad
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/grpc/grpc.go
View File

@@ -37,10 +37,10 @@ func (g *GRPC) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
} }
var ( var (
span, child ot.Span span, child ot.Span
ret *dns.Msg ret *dns.Msg
upstreamErr, err error err error
i int i int
) )
span = ot.SpanFromContext(ctx) span = ot.SpanFromContext(ctx)
list := g.list() list := g.list()
@@ -74,8 +74,6 @@ func (g *GRPC) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
child.Finish() child.Finish()
} }
upstreamErr = err
// Check if the reply is correct; if not return FormErr. // Check if the reply is correct; if not return FormErr.
if !state.Match(ret) { if !state.Match(ret) {
debug.Hexdumpf(ret, "Wrong reply for id: %d, %s %d", ret.Id, state.QName(), state.QType()) debug.Hexdumpf(ret, "Wrong reply for id: %d, %s %d", ret.Id, state.QName(), state.QType())
@@ -90,8 +88,10 @@ func (g *GRPC) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
return 0, nil return 0, nil
} }
if upstreamErr != nil { // SERVFAIL if all healthy proxys returned errors.
return dns.RcodeServerFailure, upstreamErr if err != nil {
// just return the last error received
return dns.RcodeServerFailure, err
} }
return dns.RcodeServerFailure, ErrNoHealthy return dns.RcodeServerFailure, ErrNoHealthy