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

plugin/forward: add query timeout (#1665)

Browse source
This commit is contained in:
Ruslan Drozhdzh 2018-04-11 09:53:08 +03:00 • committed by Miek Gieben
parent ccfe691b95
commit a0f294e550
2 changed files with 62 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugin/forward/forward.go
View file

@ -67,8 +67,19 @@ func (f *Forward) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
var span, child ot.Span
var upstreamErr error
span = ot.SpanFromContext(ctx)
i := 0
list := f.list()
deadline := time.Now().Add(defaultTimeout)
for _, proxy := range f.list() {
for time.Now().Before(deadline) {
if i >= len(list) {
// reached the end of list, reset to begin
i = 0
fails = 0
}
proxy := list[i]
i++
if proxy.Down(f.maxfails) {
fails++
if fails < len(f.proxies) {
@ -183,3 +194,5 @@ const (
randomPolicy policy = iota
roundRobinPolicy
)
const defaultTimeout = 5 * time.Second

50
plugin/forward/health_test.go
View file

@ -45,6 +45,7 @@ func TestHealth(t *testing.T) {
func TestHealthTimeout(t *testing.T) {
const expected = 1
i := uint32(0)
q := uint32(0)
s := dnstest.NewServer(func(w dns.ResponseWriter, r *dns.Msg) {
if r.Question[0].Name == "." {
// health check, answer
@ -52,8 +53,15 @@ func TestHealthTimeout(t *testing.T) {
ret := new(dns.Msg)
ret.SetReply(r)
w.WriteMsg(ret)
return
}
// not a health check, do a timeout
if atomic.LoadUint32(&q) == 0 { //drop only first query
atomic.AddUint32(&q, 1)
return
}
ret := new(dns.Msg)
ret.SetReply(r)
w.WriteMsg(ret)
})
defer s.Close()
@ -77,6 +85,7 @@ func TestHealthTimeout(t *testing.T) {
func TestHealthFailTwice(t *testing.T) {
const expected = 2
i := uint32(0)
q := uint32(0)
s := dnstest.NewServer(func(w dns.ResponseWriter, r *dns.Msg) {
if r.Question[0].Name == "." {
atomic.AddUint32(&i, 1)
@ -88,7 +97,15 @@ func TestHealthFailTwice(t *testing.T) {
ret := new(dns.Msg)
ret.SetReply(r)
w.WriteMsg(ret)
return
}
if atomic.LoadUint32(&q) == 0 { //drop only first query
atomic.AddUint32(&q, 1)
return
}
ret := new(dns.Msg)
ret.SetReply(r)
w.WriteMsg(ret)
})
defer s.Close()
@ -110,10 +127,39 @@ func TestHealthFailTwice(t *testing.T) {
}
func TestHealthMaxFails(t *testing.T) {
s := dnstest.NewServer(func(w dns.ResponseWriter, r *dns.Msg) {
// timeout
})
defer s.Close()
p := NewProxy(s.Addr, nil /* no TLS */)
f := New()
f.maxfails = 2
f.SetProxy(p)
defer f.Close()
req := new(dns.Msg)
req.SetQuestion("example.org.", dns.TypeA)
f.ServeDNS(context.TODO(), &test.ResponseWriter{}, req)
time.Sleep(1 * time.Second)
if !p.Down(f.maxfails) {
t.Errorf("Expected Proxy fails to be greater than %d, got %d", f.maxfails, p.fails)
}
}
func TestHealthNoMaxFails(t *testing.T) {
const expected = 0
i := uint32(0)
s := dnstest.NewServer(func(w dns.ResponseWriter, r *dns.Msg) {
// timeout
if r.Question[0].Name == "." {
// health check, answer
atomic.AddUint32(&i, 1)
ret := new(dns.Msg)
ret.SetReply(r)
w.WriteMsg(ret)
}
})
defer s.Close()