e34e2c251f
* healthchecks: check on every 3rd failure Check on every third failure and some cleanups to make this possible. A failed healthcheck will never increase Fails, a successfull healthceck will reset Fails to 0. This is a chance this counter now drops below 0, making the upstream super? healthy. This removes the okUntil smartness and condences everything back to 1 metrics: Fails; so it's simpler in that regard. Timout errors are *not* attributed to the local upstream, and don't get counted into the Fails anymore. Meaning the 'dig any isc.org' won't kill your upstream. Added extra test the see if the Fails counter gets reset after 3 failed connection. There is still a disconnect beween HTTP healthceck working the proxy (or lookup) not being able to connect to the upstream. * Fix tests
70 lines
1.6 KiB
Go
70 lines
1.6 KiB
Go
package proxy
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/coredns/coredns/plugin/pkg/healthcheck"
|
|
|
|
"google.golang.org/grpc/grpclog"
|
|
)
|
|
|
|
func pool() []*healthcheck.UpstreamHost {
|
|
return []*healthcheck.UpstreamHost{
|
|
{
|
|
Name: "localhost:10053",
|
|
},
|
|
{
|
|
Name: "localhost:10054",
|
|
},
|
|
}
|
|
}
|
|
|
|
func TestStartupShutdown(t *testing.T) {
|
|
grpclog.SetLogger(discard{})
|
|
|
|
upstream := &staticUpstream{
|
|
from: ".",
|
|
HealthCheck: healthcheck.HealthCheck{
|
|
Hosts: pool(),
|
|
FailTimeout: 10 * time.Second,
|
|
MaxFails: 1,
|
|
},
|
|
}
|
|
g := newGrpcClient(nil, upstream)
|
|
upstream.ex = g
|
|
|
|
p := &Proxy{}
|
|
p.Upstreams = &[]Upstream{upstream}
|
|
|
|
err := g.OnStartup(p)
|
|
if err != nil {
|
|
t.Errorf("Error starting grpc client exchanger: %s", err)
|
|
return
|
|
}
|
|
if len(g.clients) != len(pool()) {
|
|
t.Errorf("Expected %d grpc clients but found %d", len(pool()), len(g.clients))
|
|
}
|
|
|
|
err = g.OnShutdown(p)
|
|
if err != nil {
|
|
t.Errorf("Error stopping grpc client exchanger: %s", err)
|
|
return
|
|
}
|
|
if len(g.clients) != 0 {
|
|
t.Errorf("Shutdown didn't remove clients, found %d", len(g.clients))
|
|
}
|
|
if len(g.conns) != 0 {
|
|
t.Errorf("Shutdown didn't remove conns, found %d", len(g.conns))
|
|
}
|
|
}
|
|
|
|
// discard is a Logger that outputs nothing.
|
|
type discard struct{}
|
|
|
|
func (d discard) Fatal(args ...interface{}) {}
|
|
func (d discard) Fatalf(format string, args ...interface{}) {}
|
|
func (d discard) Fatalln(args ...interface{}) {}
|
|
func (d discard) Print(args ...interface{}) {}
|
|
func (d discard) Printf(format string, args ...interface{}) {}
|
|
func (d discard) Println(args ...interface{}) {}
|