diff options
| -rw-r--r-- | plugin/cache/cache.go | 13 | ||||
| -rw-r--r-- | plugin/cache/handler.go | 2 | ||||
| -rw-r--r-- | test/cache_test.go | 25 |
3 files changed, 17 insertions, 23 deletions
diff --git a/plugin/cache/cache.go b/plugin/cache/cache.go index b37e527cf..5d9bd746b 100644 --- a/plugin/cache/cache.go +++ b/plugin/cache/cache.go @@ -117,6 +117,19 @@ func (w *ResponseWriter) WriteMsg(res *dns.Msg) error { return nil } + // Apply capped TTL to this reply to avoid jarring TTL experience 1799 -> 8 (e.g.) + ttl := uint32(duration.Seconds()) + for i := range res.Answer { + res.Answer[i].Header().Ttl = ttl + } + for i := range res.Ns { + res.Ns[i].Header().Ttl = ttl + } + for i := range res.Extra { + if res.Extra[i].Header().Rrtype != dns.TypeOPT { + res.Extra[i].Header().Ttl = ttl + } + } return w.ResponseWriter.WriteMsg(res) } diff --git a/plugin/cache/handler.go b/plugin/cache/handler.go index ebd87d659..f3f2e675b 100644 --- a/plugin/cache/handler.go +++ b/plugin/cache/handler.go @@ -19,7 +19,7 @@ func (c *Cache) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) qtype := state.QType() zone := plugin.Zones(c.Zones).Matches(qname) if zone == "" { - return c.Next.ServeDNS(ctx, w, r) + return plugin.NextOrFailure(c.Name(), c.Next, ctx, w, r) } do := state.Do() // TODO(): might need more from OPT record? Like the actual bufsize? diff --git a/test/cache_test.go b/test/cache_test.go index 2379cd2a3..37aa55368 100644 --- a/test/cache_test.go +++ b/test/cache_test.go @@ -1,10 +1,7 @@ package test import ( - "io/ioutil" - "log" "testing" - "time" "github.com/coredns/coredns/plugin/proxy" "github.com/coredns/coredns/plugin/test" @@ -14,7 +11,6 @@ import ( ) func TestLookupCache(t *testing.T) { - t.Parallel() // Start auth. CoreDNS holding the auth zone. name, rm, err := test.TempFile(".", exampleOrg) if err != nil { @@ -35,7 +31,7 @@ func TestLookupCache(t *testing.T) { // Start caching proxy CoreDNS that we want to test. corefile = `example.org:0 { proxy . ` + udp + ` - cache + cache 10 } ` i, udp, _, err = CoreDNSServerAndPorts(corefile) @@ -44,8 +40,6 @@ func TestLookupCache(t *testing.T) { } defer i.Stop() - log.SetOutput(ioutil.Discard) - p := proxy.NewLookup([]string{udp}) state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)} @@ -59,20 +53,7 @@ func TestLookupCache(t *testing.T) { } ttl := resp.Answer[0].Header().Ttl - - time.Sleep(2 * time.Second) // TODO(miek): meh. - - resp, err = p.Lookup(state, "example.org.", dns.TypeA) - if err != nil { - t.Fatal("Expected to receive reply, but didn't") - } - - // expect answer section with A record in it - if len(resp.Answer) == 0 { - t.Error("Expected to at least one RR in the answer section, got none") - } - newTTL := resp.Answer[0].Header().Ttl - if newTTL >= ttl { - t.Errorf("Expected TTL to be lower than: %d, got %d", ttl, newTTL) + if ttl != 10 { // as set in the Corefile + t.Errorf("Expected TTL to be %d, got %d", 10, ttl) } } |