plugin/forward using pkg/up (#1493)

* plugin/forward: on demand healtchecking

Only start doing health checks when we encouner an error (any error).
This uses the new pluing/pkg/up package to abstract away the actual
checking. This reduces the LOC quite a bit; does need more testing, unit
testing and tcpdumping a bit.

* fix tests

* Fix readme

* Use pkg/up for healthchecks

* remove unused channel

* more cleanups

* update readme

* * Again do go generate and go build; still referencing the wrong forward
  repo? Anyway fixed.
* Use pkg/up for doing the healtchecks to cut back on unwanted queries
  * Change up.Func to return an error instead of a boolean.
  * Drop the string target argument as it doesn't make sense.
* Add healthcheck test on failing to get an upstream answer.

TODO(miek): double check Forward and Lookup and how they interact with
HC, and if we correctly call close() on those

* actual test

* Tests here

* more tests

* try getting rid of host

* Get rid of the host indirection

* Finish removing hosts

* moar testing

* import fmt

* field is not used

* docs

* move some stuff

* bring back health_check

* maxfails=0 test

* git and merging, bah

* review
This commit is contained in:
Miek Gieben
2018-02-15 10:21:57 +01:00
committed by GitHub
parent 8b035fa938
commit 16504234e5
15 changed files with 306 additions and 221 deletions

View File

@@ -12,20 +12,20 @@ func TestUp(t *testing.T) {
wg := sync.WaitGroup{}
hits := int32(0)
upfunc := func(s string) bool {
upfunc := func() error {
atomic.AddInt32(&hits, 1)
// Sleep tiny amount so that our other pr.Do() calls hit the lock.
time.Sleep(3 * time.Millisecond)
wg.Done()
return true
return nil
}
pr.Start("nonexistent", 5*time.Millisecond)
pr.Start(5 * time.Millisecond)
defer pr.Stop()
// These functions AddInt32 to the same hits variable, but we only want to wait when
// upfunc finishes, as that only calls Done() on the waitgroup.
upfuncNoWg := func(s string) bool { atomic.AddInt32(&hits, 1); return true }
upfuncNoWg := func() error { atomic.AddInt32(&hits, 1); return nil }
wg.Add(1)
pr.Do(upfunc)
pr.Do(upfuncNoWg)