acbcad7b4e
* reload: use OnRestart
Close the listener on OnRestart for health and metrics so the default
setup function can setup the listener when the plugin is "starting up".
Lightly test with some SIGUSR1-ing. Also checked the reload plugin with
this, seems fine:
.com.:1043
.:1043
2018/04/20 15:01:25 [INFO] CoreDNS-1.1.1
2018/04/20 15:01:25 [INFO] linux/amd64, go1.10,
CoreDNS-1.1.1
linux/amd64, go1.10,
2018/04/20 15:01:25 [INFO] Running configuration MD5 = aa8b3f03946fb60546ca1f725d482714
2018/04/20 15:02:01 [INFO] Reloading
2018/04/20 15:02:01 [INFO] Running configuration MD5 = b34a96d99e01db4015a892212560155f
2018/04/20 15:02:01 [INFO] Reloading complete
^C2018/04/20 15:02:06 [INFO] SIGINT: Shutting down
With this corefile:
.com {
proxy . 127.0.0.1:53
prometheus :9054
whoami
reload
}
. {
proxy . 127.0.0.1:53
prometheus :9054
whoami
reload
}
The prometheus port was 9053, changed that to 54 so reload would pick it
up.
From a cursory look it seems this also fixes:
Fixes #1604 #1618 #1686 #1492
* At least make it test
* Use onfinalshutdown
* reload: add reload test
This test #1604 adn right now fails.
* Address review comments
* Add bug section explaining things a bit
* compile tests
* Fix tests
* fixes
* slightly less crazy
* try to make prometheus setup less confusing
* Use ephermal port for test
* Don't use the listener
* These are shared between goroutines, just use the boolean in the main
structure.
* Fix text in the reload README,
* Set addr to TODO once stopping it
* Morph fturb's comment into test, to test reload and scrape health and
metric endpoint
125 lines
2.4 KiB
Go
125 lines
2.4 KiB
Go
package test
|
|
|
|
import (
|
|
"bytes"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
func TestReload(t *testing.T) {
|
|
corefile := `.:0 {
|
|
whoami
|
|
}
|
|
`
|
|
coreInput := NewInput(corefile)
|
|
|
|
c, err := CoreDNSServer(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get CoreDNS serving instance: %s", err)
|
|
}
|
|
|
|
udp, _ := CoreDNSServerPorts(c, 0)
|
|
|
|
send(t, udp)
|
|
|
|
c1, err := c.Restart(coreInput)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
udp, _ = CoreDNSServerPorts(c1, 0)
|
|
|
|
send(t, udp)
|
|
|
|
c1.Stop()
|
|
}
|
|
|
|
func send(t *testing.T, server string) {
|
|
m := new(dns.Msg)
|
|
m.SetQuestion("whoami.example.org.", dns.TypeSRV)
|
|
|
|
r, err := dns.Exchange(m, server)
|
|
if err != nil {
|
|
// This seems to fail a lot on travis, quick'n dirty: redo
|
|
r, err = dns.Exchange(m, server)
|
|
if err != nil {
|
|
return
|
|
}
|
|
}
|
|
if r.Rcode != dns.RcodeSuccess {
|
|
t.Fatalf("Expected successful reply, got %s", dns.RcodeToString[r.Rcode])
|
|
}
|
|
if len(r.Extra) != 2 {
|
|
t.Fatalf("Expected 2 RRs in additional, got %d", len(r.Extra))
|
|
}
|
|
}
|
|
|
|
func TestReloadHealth(t *testing.T) {
|
|
corefile := `
|
|
.:0 {
|
|
health 127.0.0.1:52182
|
|
whoami
|
|
}`
|
|
c, err := CoreDNSServer(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get service instance: %s", err)
|
|
}
|
|
|
|
// This fails with address 8080 already in use, it shouldn't.
|
|
if c1, err := c.Restart(NewInput(corefile)); err != nil {
|
|
t.Fatal(err)
|
|
} else {
|
|
c1.Stop()
|
|
}
|
|
}
|
|
|
|
func TestReloadMetricsHealth(t *testing.T) {
|
|
corefile := `
|
|
.:0 {
|
|
prometheus 127.0.0.1:53183
|
|
health 127.0.0.1:53184
|
|
whoami
|
|
}`
|
|
c, err := CoreDNSServer(corefile)
|
|
if err != nil {
|
|
t.Fatalf("Could not get service instance: %s", err)
|
|
}
|
|
|
|
c1, err := c.Restart(NewInput(corefile))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer c1.Stop()
|
|
|
|
// Send query to trigger monitoring to export on the new process
|
|
udp, _ := CoreDNSServerPorts(c1, 0)
|
|
m := new(dns.Msg)
|
|
m.SetQuestion("example.org.", dns.TypeA)
|
|
if _, err := dns.Exchange(m, udp); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Health
|
|
resp, err := http.Get("http://localhost:53184/health")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
ok, _ := ioutil.ReadAll(resp.Body)
|
|
resp.Body.Close()
|
|
if string(ok) != "OK" {
|
|
t.Errorf("Failed to receive OK, got %s", ok)
|
|
}
|
|
|
|
// Metrics
|
|
resp, err = http.Get("http://localhost:53183/metrics")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
const proc = "process_virtual_memory_bytes"
|
|
metrics, _ := ioutil.ReadAll(resp.Body)
|
|
if !bytes.Contains(metrics, []byte(proc)) {
|
|
t.Errorf("Failed to see %s in metric output", proc)
|
|
}
|
|
}
|