diff options
| author |  Miek Gieben <miek@miek.nl>
| 2019-08-01 12:51:37 +0000 |
|---|---|---|
| committer |  Yong Tang <yong.tang.github@outlook.com>
| 2019-08-01 05:51:37 -0700 |
| commit | a01b202b6ace52148dcfdfe8bc723878e0f911f8 (patch) | |
| tree | c885cccb1756301238543eeb1bfd046db2d2902a /plugin/file/zone.go | |
| parent | 3219a2b93a8010af9b5c2263c658815a4494416e (diff) | |
| download | coredns-a01b202b6ace52148dcfdfe8bc723878e0f911f8.tar.gz coredns-a01b202b6ace52148dcfdfe8bc723878e0f911f8.tar.zst coredns-a01b202b6ace52148dcfdfe8bc723878e0f911f8.zip | |
Fixes races in test and klog (#3079)
Various fixes to make things less flaky:
* kubernetes: put klog.SetOutput in the setup function, not in the init
function to see if that helps
* file: make z.Expired a boolean instead of a pointer to a boolean
* test: fix TestSecondaryZoneTransfer test, which wasn't actually
testing in the right way. It's more right now, but may still be racy
(race introduced because a file's lazy loading of zones)
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin/file/zone.go')
| -rw-r--r-- | plugin/file/zone.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/plugin/file/zone.go b/plugin/file/zone.go index d3adca29e..9a12ca69f 100644 --- a/plugin/file/zone.go +++ b/plugin/file/zone.go @@ -22,7 +22,7 @@ type Zone struct { file string *tree.Tree Apex - Expired *bool + Expired bool sync.RWMutex @@ -46,16 +46,13 @@ type Apex struct { // NewZone returns a new zone. func NewZone(name, file string) *Zone { - z := &Zone{ + return &Zone{ origin: dns.Fqdn(name), origLen: dns.CountLabel(dns.Fqdn(name)), file: filepath.Clean(file), Tree: &tree.Tree{}, - Expired: new(bool), reloadShutdown: make(chan bool), } - *z.Expired = false - return z } // Copy copies a zone. |