TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats 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