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

middleware/file: add test for reload (#361)

Browse source 
This add a highlevel integration test for zone reloading. It also
fixes a data race in the actual reloading process.
This commit is contained in:
Miek Gieben 2016-10-27 21:01:04 +01:00 • committed by GitHub
parent 94dc28646d
commit 039596f319
3 changed files with 97 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
middleware/file/lookup.go
View file

@ -26,13 +26,31 @@ const (
// Three sets of records are returned, one for the answer, one for authority and one for the additional section.
func (z *Zone) Lookup(qname string, qtype uint16, do bool) ([]dns.RR, []dns.RR, []dns.RR, Result) {
if qtype == dns.TypeSOA {
if !z.NoReload {
z.reloadMu.RLock()
}
return z.lookupSOA(do)
if !z.NoReload {
z.reloadMu.RUnlock()
}
}
if qtype == dns.TypeNS && qname == z.origin {
if !z.NoReload {
z.reloadMu.RLock()
}
return z.lookupNS(do)
if !z.NoReload {
z.reloadMu.RUnlock()
}
}
if !z.NoReload {
z.reloadMu.RLock()
}
elem, res := z.Tree.Search(qname, qtype)
if !z.NoReload {
z.reloadMu.RUnlock()
}
if elem == nil {
if res == tree.EmptyNonTerminal {
return z.emptyNonTerminal(qname, do)