TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

middleware/file: don't reload zone when SOA isn't changed (#707)

Browse source 
* middleware/file: don't reload zone when SOA isn't changed

Give Parse an extra argument which is the SOA's serial, if > 0 we check
against the just parsed SOA and then just return.

Most notable use is in reload.go which is both used in the file and auto
middleware.

Fixes #415

* PR comments
This commit is contained in:
Miek Gieben 2017-06-08 18:43:11 +01:00 • committed by GitHub
parent 1c45e262f5
commit 990460ee7c
20 changed files with 122 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

13
middleware/file/reload_test.go
View file

@ -4,6 +4,7 @@ import (
"io/ioutil"
"log"
"os"
"strings"
"testing"
"time"
@ -25,7 +26,7 @@ func TestZoneReload(t *testing.T) {
if err != nil {
t.Fatalf("failed to open zone: %s", err)
}
z, err := Parse(reader, "miek.nl", fileName)
z, err := Parse(reader, "miek.nl", fileName, 0)
if err != nil {
t.Fatalf("failed to parse zone: %s", err)
}
@ -60,6 +61,14 @@ func TestZoneReload(t *testing.T) {
}
}
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.
@ -67,7 +76,7 @@ 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. 1460175181 14400 3600 604800 14400
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.
`