mirror of
				https://github.com/coredns/coredns.git
				synced 2025-10-31 02:03:20 -04:00 
			
		
		
		
	* 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.
		
			
				
	
	
		
			189 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			189 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package cache
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 	"strconv"
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/coredns/coredns/core/dnsserver"
 | |
| 	"github.com/coredns/coredns/plugin"
 | |
| 	"github.com/coredns/coredns/plugin/metrics"
 | |
| 	"github.com/coredns/coredns/plugin/pkg/cache"
 | |
| 
 | |
| 	"github.com/mholt/caddy"
 | |
| )
 | |
| 
 | |
| func init() {
 | |
| 	caddy.RegisterPlugin("cache", caddy.Plugin{
 | |
| 		ServerType: "dns",
 | |
| 		Action:     setup,
 | |
| 	})
 | |
| }
 | |
| 
 | |
| func setup(c *caddy.Controller) error {
 | |
| 	ca, err := cacheParse(c)
 | |
| 	if err != nil {
 | |
| 		return plugin.Error("cache", err)
 | |
| 	}
 | |
| 	dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
 | |
| 		ca.Next = next
 | |
| 		return ca
 | |
| 	})
 | |
| 
 | |
| 	c.OnStartup(func() error {
 | |
| 		once.Do(func() {
 | |
| 			m := dnsserver.GetConfig(c).Handler("prometheus")
 | |
| 			if m == nil {
 | |
| 				return
 | |
| 			}
 | |
| 			if x, ok := m.(*metrics.Metrics); ok {
 | |
| 				x.MustRegister(cacheSize)
 | |
| 				x.MustRegister(cacheCapacity)
 | |
| 				x.MustRegister(cacheHits)
 | |
| 				x.MustRegister(cacheMisses)
 | |
| 				x.MustRegister(cachePrefetches)
 | |
| 			}
 | |
| 		})
 | |
| 		return nil
 | |
| 	})
 | |
| 
 | |
| 	// Initialize all counters and gauges.
 | |
| 	cacheSize.WithLabelValues(Success)
 | |
| 	cacheSize.WithLabelValues(Denial)
 | |
| 	cacheCapacity.WithLabelValues(Success).Set(float64(ca.pcap))
 | |
| 	cacheCapacity.WithLabelValues(Denial).Set(float64(ca.ncap))
 | |
| 	cacheHits.WithLabelValues(Success)
 | |
| 	cacheHits.WithLabelValues(Denial)
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func cacheParse(c *caddy.Controller) (*Cache, error) {
 | |
| 	ca := New()
 | |
| 
 | |
| 	for c.Next() {
 | |
| 		// cache [ttl] [zones..]
 | |
| 		origins := make([]string, len(c.ServerBlockKeys))
 | |
| 		copy(origins, c.ServerBlockKeys)
 | |
| 		args := c.RemainingArgs()
 | |
| 
 | |
| 		if len(args) > 0 {
 | |
| 			// first args may be just a number, then it is the ttl, if not it is a zone
 | |
| 			ttl, err := strconv.Atoi(args[0])
 | |
| 			if err == nil {
 | |
| 				// Reserve 0 (and smaller for future things)
 | |
| 				if ttl <= 0 {
 | |
| 					return nil, fmt.Errorf("cache TTL can not be zero or negative: %d", ttl)
 | |
| 				}
 | |
| 				ca.pttl = time.Duration(ttl) * time.Second
 | |
| 				ca.nttl = time.Duration(ttl) * time.Second
 | |
| 				args = args[1:]
 | |
| 			}
 | |
| 			if len(args) > 0 {
 | |
| 				copy(origins, args)
 | |
| 			}
 | |
| 		}
 | |
| 
 | |
| 		// Refinements? In an extra block.
 | |
| 		for c.NextBlock() {
 | |
| 			switch c.Val() {
 | |
| 			// first number is cap, second is an new ttl
 | |
| 			case Success:
 | |
| 				args := c.RemainingArgs()
 | |
| 				if len(args) == 0 {
 | |
| 					return nil, c.ArgErr()
 | |
| 				}
 | |
| 				pcap, err := strconv.Atoi(args[0])
 | |
| 				if err != nil {
 | |
| 					return nil, err
 | |
| 				}
 | |
| 				ca.pcap = pcap
 | |
| 				if len(args) > 1 {
 | |
| 					pttl, err := strconv.Atoi(args[1])
 | |
| 					if err != nil {
 | |
| 						return nil, err
 | |
| 					}
 | |
| 					// Reserve 0 (and smaller for future things)
 | |
| 					if pttl <= 0 {
 | |
| 						return nil, fmt.Errorf("cache TTL can not be zero or negative: %d", pttl)
 | |
| 					}
 | |
| 					ca.pttl = time.Duration(pttl) * time.Second
 | |
| 				}
 | |
| 			case Denial:
 | |
| 				args := c.RemainingArgs()
 | |
| 				if len(args) == 0 {
 | |
| 					return nil, c.ArgErr()
 | |
| 				}
 | |
| 				ncap, err := strconv.Atoi(args[0])
 | |
| 				if err != nil {
 | |
| 					return nil, err
 | |
| 				}
 | |
| 				ca.ncap = ncap
 | |
| 				if len(args) > 1 {
 | |
| 					nttl, err := strconv.Atoi(args[1])
 | |
| 					if err != nil {
 | |
| 						return nil, err
 | |
| 					}
 | |
| 					// Reserve 0 (and smaller for future things)
 | |
| 					if nttl <= 0 {
 | |
| 						return nil, fmt.Errorf("cache TTL can not be zero or negative: %d", nttl)
 | |
| 					}
 | |
| 					ca.nttl = time.Duration(nttl) * time.Second
 | |
| 				}
 | |
| 			case "prefetch":
 | |
| 				args := c.RemainingArgs()
 | |
| 				if len(args) == 0 || len(args) > 3 {
 | |
| 					return nil, c.ArgErr()
 | |
| 				}
 | |
| 				amount, err := strconv.Atoi(args[0])
 | |
| 				if err != nil {
 | |
| 					return nil, err
 | |
| 				}
 | |
| 				if amount < 0 {
 | |
| 					return nil, fmt.Errorf("prefetch amount should be positive: %d", amount)
 | |
| 				}
 | |
| 				ca.prefetch = amount
 | |
| 
 | |
| 				if len(args) > 1 {
 | |
| 					dur, err := time.ParseDuration(args[1])
 | |
| 					if err != nil {
 | |
| 						return nil, err
 | |
| 					}
 | |
| 					ca.duration = dur
 | |
| 				}
 | |
| 				if len(args) > 2 {
 | |
| 					pct := args[2]
 | |
| 					if x := pct[len(pct)-1]; x != '%' {
 | |
| 						return nil, fmt.Errorf("last character of percentage should be `%%`, but is: %q", x)
 | |
| 					}
 | |
| 					pct = pct[:len(pct)-1]
 | |
| 
 | |
| 					num, err := strconv.Atoi(pct)
 | |
| 					if err != nil {
 | |
| 						return nil, err
 | |
| 					}
 | |
| 					if num < 10 || num > 90 {
 | |
| 						return nil, fmt.Errorf("percentage should fall in range [10, 90]: %d", num)
 | |
| 					}
 | |
| 					ca.percentage = num
 | |
| 				}
 | |
| 
 | |
| 			default:
 | |
| 				return nil, c.ArgErr()
 | |
| 			}
 | |
| 		}
 | |
| 
 | |
| 		for i := range origins {
 | |
| 			origins[i] = plugin.Host(origins[i]).Normalize()
 | |
| 		}
 | |
| 		ca.Zones = origins
 | |
| 
 | |
| 		ca.pcache = cache.New(ca.pcap)
 | |
| 		ca.ncache = cache.New(ca.ncap)
 | |
| 
 | |
| 		return ca, nil
 | |
| 	}
 | |
| 
 | |
| 	return nil, nil
 | |
| }
 |