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
72 lines
2.1 KiB
Go
72 lines
2.1 KiB
Go
package proxy
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/mholt/caddy/caddyfile"
|
|
)
|
|
|
|
func TestStop(t *testing.T) {
|
|
config := "proxy . %s {\n health_check /healthcheck:%s %dms \n}"
|
|
tests := []struct {
|
|
intervalInMilliseconds int
|
|
numHealthcheckIntervals int
|
|
}{
|
|
{5, 1},
|
|
{5, 2},
|
|
{5, 3},
|
|
}
|
|
|
|
for i, test := range tests {
|
|
t.Run(fmt.Sprintf("Test %d", i), func(t *testing.T) {
|
|
|
|
// Set up proxy.
|
|
var counter int64
|
|
backend := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
r.Body.Close()
|
|
atomic.AddInt64(&counter, 1)
|
|
}))
|
|
|
|
defer backend.Close()
|
|
|
|
port := backend.URL[17:] // Remove all crap up to the port
|
|
back := backend.URL[7:] // Remove http://
|
|
c := caddyfile.NewDispenser("Testfile", strings.NewReader(fmt.Sprintf(config, back, port, test.intervalInMilliseconds)))
|
|
upstreams, err := NewStaticUpstreams(&c)
|
|
if err != nil {
|
|
t.Errorf("Test %d, expected no error. Got: %s", i, err)
|
|
}
|
|
|
|
// Give some time for healthchecks to hit the server.
|
|
time.Sleep(time.Duration(test.intervalInMilliseconds*test.numHealthcheckIntervals) * time.Millisecond)
|
|
|
|
for _, upstream := range upstreams {
|
|
if err := upstream.Stop(); err != nil {
|
|
t.Errorf("Test %d, expected no error stopping upstream, got: %s", i, err)
|
|
}
|
|
}
|
|
|
|
counterAfterShutdown := atomic.LoadInt64(&counter)
|
|
|
|
// Give some time to see if healthchecks are still hitting the server.
|
|
time.Sleep(time.Duration(test.intervalInMilliseconds*test.numHealthcheckIntervals) * time.Millisecond)
|
|
|
|
if counterAfterShutdown == 0 {
|
|
t.Errorf("Test %d, Expected healthchecks to hit test server, got none", i)
|
|
}
|
|
|
|
// health checks are in a go routine now, so one may well occur after we shutdown,
|
|
// but we only ever expect one more
|
|
counterAfterWaiting := atomic.LoadInt64(&counter)
|
|
if counterAfterWaiting > (counterAfterShutdown + 1) {
|
|
t.Errorf("Test %d, expected no more healthchecks after shutdown. got: %d healthchecks after shutdown", i, counterAfterWaiting-counterAfterShutdown)
|
|
}
|
|
})
|
|
}
|
|
}
|