e9eda7e7c8
* cache: add sharded cache implementation Add Cache impl and a few tests. This cache is 256-way sharded, mainly so each shard has it's own lock. The main cache structure is a readonly jump plane into the right shard. This should remove the single lock contention on the main lock and provide more concurrent throughput - Obviously this hasn't been tested or measured. The key into the cache was made a uint32 (hash.fnv) and the hashing op is not using strings.ToLower anymore remove any GC in that code path. * here too * Minimum shard size * typos * blurp * small cleanups no defer * typo * Add freq based on Johns idea * cherry-pick conflict resolv * typo * update from early code review from john * add prefetch to the cache * mw/cache: add prefetch * remove println * remove comment * Fix tests * Test prefetch in setup * Add start of cache * try add diff cache options * Add hacky testcase * not needed * allow the use of a percentage for prefetch If the TTL falls below xx% do a prefetch, if the record was popular. Some other fixes and correctly prefetch only popular records.
207 lines
6.1 KiB
Go
207 lines
6.1 KiB
Go
package cache
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"log"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/coredns/coredns/middleware"
|
|
"github.com/coredns/coredns/middleware/pkg/cache"
|
|
"github.com/coredns/coredns/middleware/pkg/response"
|
|
"github.com/coredns/coredns/middleware/test"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
type cacheTestCase struct {
|
|
test.Case
|
|
in test.Case
|
|
AuthenticatedData bool
|
|
Authoritative bool
|
|
RecursionAvailable bool
|
|
Truncated bool
|
|
shouldCache bool
|
|
}
|
|
|
|
var cacheTestCases = []cacheTestCase{
|
|
{
|
|
RecursionAvailable: true, AuthenticatedData: true, Authoritative: true,
|
|
Case: test.Case{
|
|
Qname: "miek.nl.", Qtype: dns.TypeMX,
|
|
Answer: []dns.RR{
|
|
test.MX("miek.nl. 3600 IN MX 1 aspmx.l.google.com."),
|
|
test.MX("miek.nl. 3600 IN MX 10 aspmx2.googlemail.com."),
|
|
},
|
|
},
|
|
in: test.Case{
|
|
Qname: "miek.nl.", Qtype: dns.TypeMX,
|
|
Answer: []dns.RR{
|
|
test.MX("miek.nl. 3601 IN MX 1 aspmx.l.google.com."),
|
|
test.MX("miek.nl. 3601 IN MX 10 aspmx2.googlemail.com."),
|
|
},
|
|
},
|
|
shouldCache: true,
|
|
},
|
|
{
|
|
RecursionAvailable: true, AuthenticatedData: true, Authoritative: true,
|
|
Case: test.Case{
|
|
Qname: "mIEK.nL.", Qtype: dns.TypeMX,
|
|
Answer: []dns.RR{
|
|
test.MX("mIEK.nL. 3600 IN MX 1 aspmx.l.google.com."),
|
|
test.MX("mIEK.nL. 3600 IN MX 10 aspmx2.googlemail.com."),
|
|
},
|
|
},
|
|
in: test.Case{
|
|
Qname: "mIEK.nL.", Qtype: dns.TypeMX,
|
|
Answer: []dns.RR{
|
|
test.MX("mIEK.nL. 3601 IN MX 1 aspmx.l.google.com."),
|
|
test.MX("mIEK.nL. 3601 IN MX 10 aspmx2.googlemail.com."),
|
|
},
|
|
},
|
|
shouldCache: true,
|
|
},
|
|
{
|
|
Truncated: true,
|
|
Case: test.Case{
|
|
Qname: "miek.nl.", Qtype: dns.TypeMX,
|
|
Answer: []dns.RR{test.MX("miek.nl. 1800 IN MX 1 aspmx.l.google.com.")},
|
|
},
|
|
in: test.Case{},
|
|
shouldCache: false,
|
|
},
|
|
{
|
|
RecursionAvailable: true, Authoritative: true,
|
|
Case: test.Case{
|
|
Rcode: dns.RcodeNameError,
|
|
Qname: "example.org.", Qtype: dns.TypeA,
|
|
Ns: []dns.RR{
|
|
test.SOA("example.org. 3600 IN SOA sns.dns.icann.org. noc.dns.icann.org. 2016082540 7200 3600 1209600 3600"),
|
|
},
|
|
},
|
|
in: test.Case{
|
|
Rcode: dns.RcodeNameError,
|
|
Qname: "example.org.", Qtype: dns.TypeA,
|
|
Ns: []dns.RR{
|
|
test.SOA("example.org. 3600 IN SOA sns.dns.icann.org. noc.dns.icann.org. 2016082540 7200 3600 1209600 3600"),
|
|
},
|
|
},
|
|
shouldCache: true,
|
|
},
|
|
{
|
|
RecursionAvailable: true, Authoritative: true,
|
|
Case: test.Case{
|
|
Qname: "miek.nl.", Qtype: dns.TypeMX,
|
|
Do: true,
|
|
Answer: []dns.RR{
|
|
test.MX("miek.nl. 3600 IN MX 1 aspmx.l.google.com."),
|
|
test.MX("miek.nl. 3600 IN MX 10 aspmx2.googlemail.com."),
|
|
test.RRSIG("miek.nl. 3600 IN RRSIG MX 8 2 1800 20160521031301 20160421031301 12051 miek.nl. lAaEzB5teQLLKyDenatmyhca7blLRg9DoGNrhe3NReBZN5C5/pMQk8Jc u25hv2fW23/SLm5IC2zaDpp2Fzgm6Jf7e90/yLcwQPuE7JjS55WMF+HE LEh7Z6AEb+Iq4BWmNhUz6gPxD4d9eRMs7EAzk13o1NYi5/JhfL6IlaYy qkc="),
|
|
},
|
|
},
|
|
in: test.Case{
|
|
Qname: "miek.nl.", Qtype: dns.TypeMX,
|
|
Do: true,
|
|
Answer: []dns.RR{
|
|
test.MX("miek.nl. 3600 IN MX 1 aspmx.l.google.com."),
|
|
test.MX("miek.nl. 3600 IN MX 10 aspmx2.googlemail.com."),
|
|
test.RRSIG("miek.nl. 1800 IN RRSIG MX 8 2 1800 20160521031301 20160421031301 12051 miek.nl. lAaEzB5teQLLKyDenatmyhca7blLRg9DoGNrhe3NReBZN5C5/pMQk8Jc u25hv2fW23/SLm5IC2zaDpp2Fzgm6Jf7e90/yLcwQPuE7JjS55WMF+HE LEh7Z6AEb+Iq4BWmNhUz6gPxD4d9eRMs7EAzk13o1NYi5/JhfL6IlaYy qkc="),
|
|
},
|
|
},
|
|
shouldCache: false,
|
|
},
|
|
{
|
|
RecursionAvailable: true, Authoritative: true,
|
|
Case: test.Case{
|
|
Qname: "example.org.", Qtype: dns.TypeMX,
|
|
Do: true,
|
|
Answer: []dns.RR{
|
|
test.MX("example.org. 3600 IN MX 1 aspmx.l.google.com."),
|
|
test.MX("example.org. 3600 IN MX 10 aspmx2.googlemail.com."),
|
|
test.RRSIG("example.org. 3600 IN RRSIG MX 8 2 1800 20170521031301 20170421031301 12051 miek.nl. lAaEzB5teQLLKyDenatmyhca7blLRg9DoGNrhe3NReBZN5C5/pMQk8Jc u25hv2fW23/SLm5IC2zaDpp2Fzgm6Jf7e90/yLcwQPuE7JjS55WMF+HE LEh7Z6AEb+Iq4BWmNhUz6gPxD4d9eRMs7EAzk13o1NYi5/JhfL6IlaYy qkc="),
|
|
},
|
|
},
|
|
in: test.Case{
|
|
Qname: "example.org.", Qtype: dns.TypeMX,
|
|
Do: true,
|
|
Answer: []dns.RR{
|
|
test.MX("example.org. 3600 IN MX 1 aspmx.l.google.com."),
|
|
test.MX("example.org. 3600 IN MX 10 aspmx2.googlemail.com."),
|
|
test.RRSIG("example.org. 1800 IN RRSIG MX 8 2 1800 20170521031301 20170421031301 12051 miek.nl. lAaEzB5teQLLKyDenatmyhca7blLRg9DoGNrhe3NReBZN5C5/pMQk8Jc u25hv2fW23/SLm5IC2zaDpp2Fzgm6Jf7e90/yLcwQPuE7JjS55WMF+HE LEh7Z6AEb+Iq4BWmNhUz6gPxD4d9eRMs7EAzk13o1NYi5/JhfL6IlaYy qkc="),
|
|
},
|
|
},
|
|
shouldCache: true,
|
|
},
|
|
}
|
|
|
|
func cacheMsg(m *dns.Msg, tc cacheTestCase) *dns.Msg {
|
|
m.RecursionAvailable = tc.RecursionAvailable
|
|
m.AuthenticatedData = tc.AuthenticatedData
|
|
m.Authoritative = tc.Authoritative
|
|
m.Rcode = tc.Rcode
|
|
m.Truncated = tc.Truncated
|
|
m.Answer = tc.in.Answer
|
|
m.Ns = tc.in.Ns
|
|
// m.Extra = tc.in.Extra don't copy Extra, because we don't care and fake EDNS0 DO with tc.Do.
|
|
return m
|
|
}
|
|
|
|
func newTestCache(ttl time.Duration) (*Cache, *ResponseWriter) {
|
|
c := &Cache{Zones: []string{"."}, pcap: defaultCap, ncap: defaultCap, pttl: ttl, nttl: ttl}
|
|
c.pcache = cache.New(c.pcap)
|
|
c.ncache = cache.New(c.ncap)
|
|
|
|
crr := &ResponseWriter{ResponseWriter: nil, Cache: c}
|
|
return c, crr
|
|
}
|
|
|
|
func TestCache(t *testing.T) {
|
|
now, _ := time.Parse(time.UnixDate, "Fri Apr 21 10:51:21 BST 2017")
|
|
utc := now.UTC()
|
|
|
|
c, crr := newTestCache(maxTTL)
|
|
|
|
log.SetOutput(ioutil.Discard)
|
|
|
|
for _, tc := range cacheTestCases {
|
|
m := tc.in.Msg()
|
|
m = cacheMsg(m, tc)
|
|
do := tc.in.Do
|
|
|
|
mt, _ := response.Typify(m, utc)
|
|
k := key(m, mt, do)
|
|
|
|
crr.set(m, k, mt, c.pttl)
|
|
|
|
name := middleware.Name(m.Question[0].Name).Normalize()
|
|
qtype := m.Question[0].Qtype
|
|
|
|
i, _ := c.get(time.Now().UTC(), name, qtype, do)
|
|
ok := i != nil
|
|
|
|
if ok != tc.shouldCache {
|
|
t.Errorf("cached message that should not have been cached: %s", name)
|
|
continue
|
|
}
|
|
|
|
if ok {
|
|
resp := i.toMsg(m)
|
|
|
|
if !test.Header(t, tc.Case, resp) {
|
|
t.Logf("%v\n", resp)
|
|
continue
|
|
}
|
|
|
|
if !test.Section(t, tc.Case, test.Answer, resp.Answer) {
|
|
t.Logf("%v\n", resp)
|
|
}
|
|
if !test.Section(t, tc.Case, test.Ns, resp.Ns) {
|
|
t.Logf("%v\n", resp)
|
|
|
|
}
|
|
if !test.Section(t, tc.Case, test.Extra, resp.Extra) {
|
|
t.Logf("%v\n", resp)
|
|
}
|
|
}
|
|
}
|
|
}
|