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:
Miek Gieben 2019-08-01 12:51:37 +00:00 committed by Yong Tang
parent 3219a2b93a
commit a01b202b6a
6 changed files with 11 additions and 16 deletions

View file

@ -19,7 +19,7 @@ import (
"github.com/miekg/dns"
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
// Pull this in for logtostderr flag parsing
// Pull this in setting klog's output to stdout
"k8s.io/klog"
// Excluding azure because it is failing to compile
@ -35,8 +35,6 @@ import (
var log = clog.NewWithPlugin("kubernetes")
func init() {
klog.SetOutput(os.Stdout)
caddy.RegisterPlugin("kubernetes", caddy.Plugin{
ServerType: "dns",
Action: setup,
@ -44,6 +42,8 @@ func init() {
}
func setup(c *caddy.Controller) error {
klog.SetOutput(os.Stdout)
k, err := kubernetesParse(c)
if err != nil {
return plugin.Error("kubernetes", err)