mirror of
				https://github.com/coredns/coredns.git
				synced 2025-10-31 10:13:14 -04:00 
			
		
		
		
	* plugin/{file,auto}: drop fsnotify
Reload every minute. This is more deterministic then fsnotify. Also
other thing cropped up: sharing zone files between zone; there is only
1 fsnotify event and we need to fan out the reload to all zone files.
This is a large rewrite (which could still be done), for now, poll the
zone file on disk.
Give serial no change a special error type so we can check for this.
Improve the logging for reloading:
2017/09/19 07:34:39 [INFO] Successfully reloaded zone "miek.nl." in "db.miek.nl" with serial 128263060
2017/09/19 07:34:45 [INFO] Successfully reloaded zone "miek.nl." in "db.miek.nl" with serial 128263059
2017/09/19 07:34:51 [INFO] Successfully reloaded zone "miek.nl." in "db.miek.nl" with serial 128263060
Fixes #1013
* typo
		
	
		
			
				
	
	
		
			85 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			85 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package file
 | |
| 
 | |
| import (
 | |
| 	"io/ioutil"
 | |
| 	"log"
 | |
| 	"os"
 | |
| 	"strings"
 | |
| 	"testing"
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/coredns/coredns/plugin/test"
 | |
| 	"github.com/coredns/coredns/request"
 | |
| 
 | |
| 	"github.com/miekg/dns"
 | |
| )
 | |
| 
 | |
| func TestZoneReload(t *testing.T) {
 | |
| 	log.SetOutput(ioutil.Discard)
 | |
| 
 | |
| 	fileName, rm, err := test.TempFile(".", reloadZoneTest)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("failed to create zone: %s", err)
 | |
| 	}
 | |
| 	defer rm()
 | |
| 	reader, err := os.Open(fileName)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("failed to open zone: %s", err)
 | |
| 	}
 | |
| 	z, err := Parse(reader, "miek.nl", fileName, 0)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("failed to parse zone: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	TickTime = 500 * time.Millisecond
 | |
| 	z.Reload()
 | |
| 	time.Sleep(time.Second)
 | |
| 
 | |
| 	r := new(dns.Msg)
 | |
| 	r.SetQuestion("miek.nl", dns.TypeSOA)
 | |
| 	state := request.Request{W: &test.ResponseWriter{}, Req: r}
 | |
| 	if _, _, _, res := z.Lookup(state, "miek.nl."); res != Success {
 | |
| 		t.Fatalf("failed to lookup, got %d", res)
 | |
| 	}
 | |
| 
 | |
| 	r = new(dns.Msg)
 | |
| 	r.SetQuestion("miek.nl", dns.TypeNS)
 | |
| 	state = request.Request{W: &test.ResponseWriter{}, Req: r}
 | |
| 	if _, _, _, res := z.Lookup(state, "miek.nl."); res != Success {
 | |
| 		t.Fatalf("failed to lookup, got %d", res)
 | |
| 	}
 | |
| 
 | |
| 	if len(z.All()) != 5 {
 | |
| 		t.Fatalf("expected 5 RRs, got %d", len(z.All()))
 | |
| 	}
 | |
| 	if err := ioutil.WriteFile(fileName, []byte(reloadZone2Test), 0644); err != nil {
 | |
| 		t.Fatalf("failed to write new zone data: %s", err)
 | |
| 	}
 | |
| 	// Could still be racy, but we need to wait a bit for the event to be seen
 | |
| 	time.Sleep(1 * time.Second)
 | |
| 
 | |
| 	if len(z.All()) != 3 {
 | |
| 		t.Fatalf("expected 3 RRs, got %d", len(z.All()))
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestZoneReloadSOAChange(t *testing.T) {
 | |
| 	_, err := Parse(strings.NewReader(reloadZoneTest), "miek.nl.", "stdin", 1460175181)
 | |
| 	if err == nil {
 | |
| 		t.Fatalf("zone should not have been re-parsed")
 | |
| 	}
 | |
| 
 | |
| }
 | |
| 
 | |
| const reloadZoneTest = `miek.nl.		1627	IN	SOA	linode.atoom.net. miek.miek.nl. 1460175181 14400 3600 604800 14400
 | |
| miek.nl.		1627	IN	NS	ext.ns.whyscream.net.
 | |
| miek.nl.		1627	IN	NS	omval.tednet.nl.
 | |
| miek.nl.		1627	IN	NS	linode.atoom.net.
 | |
| miek.nl.		1627	IN	NS	ns-ext.nlnetlabs.nl.
 | |
| `
 | |
| 
 | |
| const reloadZone2Test = `miek.nl.		1627	IN	SOA	linode.atoom.net. miek.miek.nl. 1460175182 14400 3600 604800 14400
 | |
| miek.nl.		1627	IN	NS	ext.ns.whyscream.net.
 | |
| miek.nl.		1627	IN	NS	omval.tednet.nl.
 | |
| `
 |