Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-01 18:53:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

middleware/file: reload on file mv (#365)

Browse Source 
When a file is moved into position we should also reload the zones'
content.

This also fixes deadlock bug in the locking, a reload would block any
further lookups.
This commit is contained in:
Miek Gieben
2016-10-28 12:57:02 +01:00
committed by GitHub
parent 54964653d1
commit 0509f4b4ac
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
middleware/file/lookup.go
View File

@@ -29,28 +29,36 @@ func (z *Zone) Lookup(qname string, qtype uint16, do bool) ([]dns.RR, []dns.RR,
if !z.NoReload {
z.reloadMu.RLock()
}
return z.lookupSOA(do)
r1, r2, r3, res := z.lookupSOA(do)
if !z.NoReload {
z.reloadMu.RUnlock()
}
return r1, r2, r3, res
}
if qtype == dns.TypeNS && qname == z.origin {
if !z.NoReload {
z.reloadMu.RLock()
}
return z.lookupNS(do)
r1, r2, r3, res := z.lookupNS(do)
if !z.NoReload {
z.reloadMu.RUnlock()
}
return r1, r2, r3, res
}
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)