Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 08:14:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/ready: fix starts and restarts (#2814)

Browse Source 
Add OnRestartFailed to the ready plugin and some various cleanups.

Document slightly better how things are supposed to work with multiple
`ready`'s in the multiple Server Blocks.

All manually tested with this Corefile:
~~~
. {
    log
    ready
}

example.org {
    log
    chaos
    ready
}
~~~
And then `kill -SIGUSR1` and curling the ready endpoint. This works
well, the FailedReload is triggered by adding a syntax error in the
Corefile.

See #2659

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2019-06-09 08:10:15 +01:00
committed by GitHub
parent bd83f74deb
commit a1c97f82a6
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/ready/README.md
View File

@@ -12,7 +12,9 @@ body containing the list of plugins that are not ready. Once a plugin has signal
will not be queried again.
Each Server Block that enables the *ready* plugin will have the plugins *in that server block*
report readiness into the /ready endpoint that runs on the same port.
report readiness into the /ready endpoint that runs on the same port. This also means that the
*same* plugin with different configurations (in potentialy *different* Server Blocks) will have
their readiness reported as the union of their respective readinesses.
## Syntax
@@ -22,7 +24,7 @@ ready [ADDRESS]
*ready* optionally takes an address; the default is `:8181`. The path is fixed to `/ready`. The
readiness endpoint returns a 200 response code and the word "OK" when this server is ready. It
returns a 503 otherwise.
returns a 503 otherwise *and* the list of plugins that are not ready.
## Plugins

8
plugin/ready/ready.go
View File

@@ -30,10 +30,6 @@ type ready struct {
}
func (rd *ready) onStartup() error {
if rd.Addr == "" {
rd.Addr = defAddr
}
ln, err := net.Listen("tcp", rd.Addr)
if err != nil {
return err
@@ -62,8 +58,6 @@ func (rd *ready) onStartup() error {
return nil
}
func (rd *ready) onRestart() error { return rd.onFinalShutdown() }
func (rd *ready) onFinalShutdown() error {
rd.Lock()
defer rd.Unlock()
@@ -77,5 +71,3 @@ func (rd *ready) onFinalShutdown() error {
rd.done = false
return nil
}
const defAddr = ":8181"

27
plugin/ready/setup.go
View File

@@ -21,22 +21,25 @@ func setup(c *caddy.Controller) error {
if err != nil {
return plugin.Error("ready", err)
}
rd := &ready{Addr: addr}
uniqAddr.Set(addr, rd.onStartup)
c.OnStartup(func() error { uniqAddr.Set(addr, rd.onStartup); return nil })
c.OnRestartFailed(func() error { uniqAddr.Set(addr, rd.onStartup); return nil })
c.OncePerServerBlock(func() error {
c.OnStartup(func() error {
return uniqAddr.ForEach()
})
return nil
})
c.OnStartup(func() error { return uniqAddr.ForEach() })
c.OnRestartFailed(func() error { return uniqAddr.ForEach() })
c.OnStartup(func() error {
// Each plugin in this server block will (if they support it) report readiness.
plugs := dnsserver.GetConfig(c).Handlers()
for _, p := range plugs {
for _, p := range dnsserver.GetConfig(c).Handlers() {
if r, ok := p.(Readiness); ok {
plugins.Append(r, p.Name())
}
}
return nil
})
c.OnRestartFailed(func() error {
for _, p := range dnsserver.GetConfig(c).Handlers() {
if r, ok := p.(Readiness); ok {
plugins.Append(r, p.Name())
}
@@ -44,14 +47,14 @@ func setup(c *caddy.Controller) error {
return nil
})
c.OnRestart(rd.onRestart)
c.OnRestart(rd.onFinalShutdown)
c.OnFinalShutdown(rd.onFinalShutdown)
return nil
}
func parse(c *caddy.Controller) (string, error) {
addr := ""
addr := ":8181"
i := 0
for c.Next() {
if i > 0 {