mirror of
https://github.com/coredns/coredns.git
synced 2025-11-09 21:42:17 -05:00
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>
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user