diff options
| author |  Miek Gieben <miek@miek.nl>
| 2019-06-29 22:22:34 +0100 |
|---|---|---|
| committer |  Yong Tang <yong.tang.github@outlook.com>
| 2019-06-30 05:22:34 +0800 |
| commit | 3a0c7c61532db7f8e4ce79f99129201a79729525 (patch) | |
| tree | fab82dba453c4676a796f3b2e8f02b3573a1466f /plugin/file/secondary.go | |
| parent | 2c1f5009be5fa0074b1e204f1c2906d6d1f8ea68 (diff) | |
| download | coredns-3a0c7c61532db7f8e4ce79f99129201a79729525.tar.gz coredns-3a0c7c61532db7f8e4ce79f99129201a79729525.tar.zst coredns-3a0c7c61532db7f8e4ce79f99129201a79729525.zip | |
plugin/file: load secondary zones lazily on startup (#2944)
This fixes a long standing bug:
fixes: #1609
Load secondary zones in a go-routine; this required another mutex to
protect some fields; I think those were needded anyway because a
transfer can also happen when we're running; we just didn't have a test
for that situation.
The test had to be changed to wait for the transfer to happen at this is
async now.
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin/file/secondary.go')
| -rw-r--r-- | plugin/file/secondary.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugin/file/secondary.go b/plugin/file/secondary.go index 049fe0cda..ed94daad6 100644 --- a/plugin/file/secondary.go +++ b/plugin/file/secondary.go @@ -51,9 +51,11 @@ Transfer: return Err } + z.apexMu.Lock() z.Tree = z1.Tree z.Apex = z1.Apex *z.Expired = false + z.apexMu.Unlock() log.Infof("Transferred: %s from %s", z.origin, tr) return nil } |