diff options
author | 2018-01-17 08:35:22 +0100 | |
---|---|---|
committer | 2018-01-17 07:35:22 +0000 | |
commit | dd9fc8962c7f51b358c8c127e3efaece559d81f8 (patch) | |
tree | b1a4e84e76b86eea7e6cf87d10d6c0f2ad945081 /plugin/cache/cache.go | |
parent | fe0767987e0887cd0121b800241d3d710273ff3d (diff) | |
download | coredns-dd9fc8962c7f51b358c8c127e3efaece559d81f8.tar.gz coredns-dd9fc8962c7f51b358c8c127e3efaece559d81f8.tar.zst coredns-dd9fc8962c7f51b358c8c127e3efaece559d81f8.zip |
plugin/cache: Fix prefetching issues (#1363)
* Improve plugin/cache metrics
* Add coredns_cache_prefetch_total metric to track number of prefetches.
* Remove unnecessary Cache.get() call which would incorrectly increment
cache counters.
* Initialize all counters and gauges at zero.
* Allow prefetching of a single request per ttl
The original implementation didn't allow prefetching queries which are
only requested once during the duration of a TTL. The minimum amount of
queries which had to be seen was therefore capped at 2.
This change also implements a real prefetch test. The existing test was
a noop and always passed regardless of any prefetch implementation.
* Fix prefetching for items with a short TTL
The default prefetch threshold (percentage) is 10% of the lifetime of a
cache item. With the previous implementation, this disabled prefetching
for all items with a TTL < 10s (the resulting percentage would be 0, at
which point a cached item is already discarded).
This change uses a time based threshold calculation and ensures that
a prefetch is triggered at a TTL of 1 at the latest.
* Fix wrong duration reporting of cached responses
The logging and metrics plugins (among others) included the duration of
a cache prefetch in the request latency of client request. This change
fixes this wrong reporting and executes the prefetch request in a
goroutine in the background.
Diffstat (limited to 'plugin/cache/cache.go')
-rw-r--r-- | plugin/cache/cache.go | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/plugin/cache/cache.go b/plugin/cache/cache.go index caa38d1f0..cb7a10140 100644 --- a/plugin/cache/cache.go +++ b/plugin/cache/cache.go @@ -32,6 +32,27 @@ type Cache struct { prefetch int duration time.Duration percentage int + + // Testing. + now func() time.Time +} + +// New returns an initialized Cache with default settings. It's up to the +// caller to set the Next handler. +func New() *Cache { + return &Cache{ + Zones: []string{"."}, + pcap: defaultCap, + pcache: cache.New(defaultCap), + pttl: maxTTL, + ncap: defaultCap, + ncache: cache.New(defaultCap), + nttl: maxNTTL, + prefetch: 0, + duration: 1 * time.Minute, + percentage: 10, + now: time.Now, + } } // Return key under which we store the item, -1 will be returned if we don't store the @@ -88,7 +109,7 @@ type ResponseWriter struct { // WriteMsg implements the dns.ResponseWriter interface. func (w *ResponseWriter) WriteMsg(res *dns.Msg) error { do := false - mt, opt := response.Typify(res, time.Now().UTC()) + mt, opt := response.Typify(res, w.now().UTC()) if opt != nil { do = opt.Do() } @@ -140,11 +161,11 @@ func (w *ResponseWriter) set(m *dns.Msg, key int, mt response.Type, duration tim switch mt { case response.NoError, response.Delegation: - i := newItem(m, duration) + i := newItem(m, w.now(), duration) w.pcache.Add(uint32(key), i) case response.NameError, response.NoData: - i := newItem(m, duration) + i := newItem(m, w.now(), duration) w.ncache.Add(uint32(key), i) case response.OtherError: |