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

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
Show stats 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 { if !z.NoReload {
z.reloadMu.RLock() z.reloadMu.RLock()
} }
return z.lookupSOA(do)
r1, r2, r3, res := z.lookupSOA(do)
if !z.NoReload { if !z.NoReload {
z.reloadMu.RUnlock() z.reloadMu.RUnlock()
} }
return r1, r2, r3, res
} }
if qtype == dns.TypeNS && qname == z.origin { if qtype == dns.TypeNS && qname == z.origin {
if !z.NoReload { if !z.NoReload {
z.reloadMu.RLock() z.reloadMu.RLock()
} }
return z.lookupNS(do)
r1, r2, r3, res := z.lookupNS(do)
if !z.NoReload { if !z.NoReload {
z.reloadMu.RUnlock() z.reloadMu.RUnlock()
} }
return r1, r2, r3, res
} }
if !z.NoReload { if !z.NoReload {
z.reloadMu.RLock() z.reloadMu.RLock()
} }
elem, res := z.Tree.Search(qname, qtype) elem, res := z.Tree.Search(qname, qtype)
if !z.NoReload { if !z.NoReload {
z.reloadMu.RUnlock() z.reloadMu.RUnlock()
} }
if elem == nil { if elem == nil {
if res == tree.EmptyNonTerminal { if res == tree.EmptyNonTerminal {
return z.emptyNonTerminal(qname, do) return z.emptyNonTerminal(qname, do)

6
middleware/file/zone.go
View file

@ -123,8 +123,10 @@ func (z *Zone) TransferAllowed(req request.Request) bool {
// All returns all records from the zone, the first record will be the SOA record, // All returns all records from the zone, the first record will be the SOA record,
// otionally followed by all RRSIG(SOA)s. // otionally followed by all RRSIG(SOA)s.
func (z *Zone) All() []dns.RR { func (z *Zone) All() []dns.RR {
if !z.NoReload {
z.reloadMu.RLock() z.reloadMu.RLock()
defer z.reloadMu.RUnlock() defer z.reloadMu.RUnlock()
}
records := []dns.RR{} records := []dns.RR{}
allNodes := z.Tree.All() allNodes := z.Tree.All()
@ -162,7 +164,9 @@ func (z *Zone) Reload() error {
for { for {
select { select {
case event := <-watcher.Events: case event := <-watcher.Events:
if event.Op == fsnotify.Write && path.Clean(event.Name) == z.file { // Looks for Write and Create events. Write is obvious, Create is used when
// a file in mv-ed into this place.
if (event.Op == fsnotify.Write || event.Op == fsnotify.Create) && path.Clean(event.Name) == z.file {
reader, err := os.Open(z.file) reader, err := os.Open(z.file)
if err != nil { if err != nil {