2016-08-19 17:14:17 -07:00
|
|
|
package file
|
2016-03-18 20:57:35 +00:00
|
|
|
|
|
|
|
import (
|
2021-11-20 00:19:25 +08:00
|
|
|
"errors"
|
2016-03-18 20:57:35 +00:00
|
|
|
"os"
|
2018-10-21 15:59:37 +02:00
|
|
|
"path/filepath"
|
2018-09-29 17:50:49 +02:00
|
|
|
"time"
|
2016-03-18 20:57:35 +00:00
|
|
|
|
2020-09-24 18:14:41 +02:00
|
|
|
"github.com/coredns/caddy"
|
2017-02-21 22:51:47 -08:00
|
|
|
"github.com/coredns/coredns/core/dnsserver"
|
2017-09-14 09:36:06 +01:00
|
|
|
"github.com/coredns/coredns/plugin"
|
2018-02-16 03:44:50 -05:00
|
|
|
"github.com/coredns/coredns/plugin/pkg/upstream"
|
2020-09-24 11:30:39 -07:00
|
|
|
"github.com/coredns/coredns/plugin/transfer"
|
2016-03-18 20:57:35 +00:00
|
|
|
)
|
|
|
|
|
2019-09-20 08:02:30 +01:00
|
|
|
func init() { plugin.Register("file", setup) }
|
2016-08-19 17:14:17 -07:00
|
|
|
|
|
|
|
func setup(c *caddy.Controller) error {
|
2016-03-18 20:57:35 +00:00
|
|
|
zones, err := fileParse(c)
|
|
|
|
if err != nil {
|
2017-09-14 09:36:06 +01:00
|
|
|
return plugin.Error("file", err)
|
2016-03-18 20:57:35 +00:00
|
|
|
}
|
2016-04-03 07:37:41 +01:00
|
|
|
|
2020-09-24 11:30:39 -07:00
|
|
|
f := File{Zones: zones}
|
|
|
|
// get the transfer plugin, so we can send notifies and send notifies on startup as well.
|
|
|
|
c.OnStartup(func() error {
|
|
|
|
t := dnsserver.GetConfig(c).Handler("transfer")
|
|
|
|
if t == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
f.transfer = t.(*transfer.Transfer) // if found this must be OK.
|
Speed up testing (#4239)
* Speed up testing
* make notification run in the background, this recudes the test_readme
time from 18s to 0.10s
* reduce time for zone reload
* TestServeDNSConcurrent remove entirely. This took a whopping 58s for
... ? A few minutes staring didn't reveal wth it is actually testing.
Making values smaller revealed race conditions in the tests. Remove
entirely.
* Move many interval values to variables so we can reset them to short
values for the tests.
* test_large_axfr: make the zone smaller. The number used 64K has no
rational, make it 64/10 to speed up.
* TestProxyThreeWay: use client with shorter timeout
A few random tidbits in other tests.
Total time saved: 177s (almost 3m) - which makes it worthwhile again to
run the test locally:
this branch:
~~~
ok github.com/coredns/coredns/test 10.437s
cd plugin; time go t ./...
5,51s user 7,51s system 11,15s elapsed 744%CPU (
~~~
master:
~~~
ok github.com/coredns/coredns/test 35.252s
cd plugin; time go t ./...
157,64s user 15,39s system 50,05s elapsed 345%CPU ()
~~~
tests/ -25s
plugins/ -40s
This brings the total on 20s, and another 10s can be saved by fixing
dnstapio. Moving this to 5s would be even better, but 10s is also nice.
Signed-off-by: Miek Gieben <miek@miek.nl>
* Also 0.01
Signed-off-by: Miek Gieben <miek@miek.nl>
2020-10-30 10:27:04 +01:00
|
|
|
go func() {
|
|
|
|
for _, n := range zones.Names {
|
|
|
|
f.transfer.Notify(n)
|
|
|
|
}
|
|
|
|
}()
|
2020-09-24 11:30:39 -07:00
|
|
|
return nil
|
|
|
|
})
|
|
|
|
|
|
|
|
c.OnRestartFailed(func() error {
|
|
|
|
t := dnsserver.GetConfig(c).Handler("transfer")
|
|
|
|
if t == nil {
|
|
|
|
return nil
|
|
|
|
}
|
Speed up testing (#4239)
* Speed up testing
* make notification run in the background, this recudes the test_readme
time from 18s to 0.10s
* reduce time for zone reload
* TestServeDNSConcurrent remove entirely. This took a whopping 58s for
... ? A few minutes staring didn't reveal wth it is actually testing.
Making values smaller revealed race conditions in the tests. Remove
entirely.
* Move many interval values to variables so we can reset them to short
values for the tests.
* test_large_axfr: make the zone smaller. The number used 64K has no
rational, make it 64/10 to speed up.
* TestProxyThreeWay: use client with shorter timeout
A few random tidbits in other tests.
Total time saved: 177s (almost 3m) - which makes it worthwhile again to
run the test locally:
this branch:
~~~
ok github.com/coredns/coredns/test 10.437s
cd plugin; time go t ./...
5,51s user 7,51s system 11,15s elapsed 744%CPU (
~~~
master:
~~~
ok github.com/coredns/coredns/test 35.252s
cd plugin; time go t ./...
157,64s user 15,39s system 50,05s elapsed 345%CPU ()
~~~
tests/ -25s
plugins/ -40s
This brings the total on 20s, and another 10s can be saved by fixing
dnstapio. Moving this to 5s would be even better, but 10s is also nice.
Signed-off-by: Miek Gieben <miek@miek.nl>
* Also 0.01
Signed-off-by: Miek Gieben <miek@miek.nl>
2020-10-30 10:27:04 +01:00
|
|
|
go func() {
|
|
|
|
for _, n := range zones.Names {
|
|
|
|
f.transfer.Notify(n)
|
|
|
|
}
|
|
|
|
}()
|
2020-09-24 11:30:39 -07:00
|
|
|
return nil
|
|
|
|
})
|
|
|
|
|
2016-04-05 10:53:23 +01:00
|
|
|
for _, n := range zones.Names {
|
2016-10-18 00:04:18 +08:00
|
|
|
z := zones.Z[n]
|
2020-09-24 11:30:39 -07:00
|
|
|
c.OnShutdown(z.OnShutdown)
|
2016-08-19 17:14:17 -07:00
|
|
|
c.OnStartup(func() error {
|
2020-09-24 11:30:39 -07:00
|
|
|
z.StartupOnce.Do(func() { z.Reload(f.transfer) })
|
2016-04-15 14:26:27 +01:00
|
|
|
return nil
|
|
|
|
})
|
2016-04-05 10:53:23 +01:00
|
|
|
}
|
|
|
|
|
2017-09-14 09:36:06 +01:00
|
|
|
dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
|
2020-09-24 11:30:39 -07:00
|
|
|
f.Next = next
|
|
|
|
return f
|
2016-08-19 17:14:17 -07:00
|
|
|
})
|
2016-03-18 20:57:35 +00:00
|
|
|
|
2016-08-19 17:14:17 -07:00
|
|
|
return nil
|
2016-03-18 20:57:35 +00:00
|
|
|
}
|
|
|
|
|
2016-08-19 17:14:17 -07:00
|
|
|
func fileParse(c *caddy.Controller) (Zones, error) {
|
|
|
|
z := make(map[string]*Zone)
|
2016-03-18 20:57:35 +00:00
|
|
|
names := []string{}
|
2016-08-19 17:14:17 -07:00
|
|
|
|
2016-10-11 20:42:28 +01:00
|
|
|
config := dnsserver.GetConfig(c)
|
|
|
|
|
2019-07-04 06:56:37 +01:00
|
|
|
var openErr error
|
|
|
|
reload := 1 * time.Minute
|
|
|
|
|
2016-03-18 20:57:35 +00:00
|
|
|
for c.Next() {
|
2017-08-10 05:30:18 -07:00
|
|
|
// file db.file [zones...]
|
|
|
|
if !c.NextArg() {
|
|
|
|
return Zones{}, c.ArgErr()
|
|
|
|
}
|
|
|
|
fileName := c.Val()
|
2016-03-18 20:57:35 +00:00
|
|
|
|
2021-05-17 22:19:54 +02:00
|
|
|
origins := plugin.OriginsFromArgsOrServerBlock(c.RemainingArgs(), c.ServerBlockKeys)
|
2018-10-21 15:59:37 +02:00
|
|
|
if !filepath.IsAbs(fileName) && config.Root != "" {
|
|
|
|
fileName = filepath.Join(config.Root, fileName)
|
2017-08-10 05:30:18 -07:00
|
|
|
}
|
|
|
|
|
2022-02-14 08:24:21 -08:00
|
|
|
reader, err := os.Open(filepath.Clean(fileName))
|
2017-08-10 05:30:18 -07:00
|
|
|
if err != nil {
|
2019-07-04 06:56:37 +01:00
|
|
|
openErr = err
|
2017-08-10 05:30:18 -07:00
|
|
|
}
|
2016-10-11 20:42:28 +01:00
|
|
|
|
2017-08-10 05:30:18 -07:00
|
|
|
for i := range origins {
|
2019-07-04 06:56:37 +01:00
|
|
|
z[origins[i]] = NewZone(origins[i], fileName)
|
|
|
|
if openErr == nil {
|
2019-07-27 11:47:55 +00:00
|
|
|
reader.Seek(0, 0)
|
2019-07-04 06:56:37 +01:00
|
|
|
zone, err := Parse(reader, origins[i], fileName, 0)
|
2021-05-17 22:19:54 +02:00
|
|
|
if err != nil {
|
2019-07-04 06:56:37 +01:00
|
|
|
return Zones{}, err
|
|
|
|
}
|
2021-05-17 22:19:54 +02:00
|
|
|
z[origins[i]] = zone
|
2016-03-27 07:37:23 +01:00
|
|
|
}
|
2017-08-10 05:30:18 -07:00
|
|
|
names = append(names, origins[i])
|
|
|
|
}
|
2016-04-03 15:52:23 +01:00
|
|
|
|
2017-08-10 05:30:18 -07:00
|
|
|
for c.NextBlock() {
|
|
|
|
switch c.Val() {
|
2018-09-29 17:50:49 +02:00
|
|
|
case "reload":
|
2021-11-20 00:19:25 +08:00
|
|
|
t := c.RemainingArgs()
|
|
|
|
if len(t) < 1 {
|
|
|
|
return Zones{}, errors.New("reload duration value is expected")
|
|
|
|
}
|
|
|
|
d, err := time.ParseDuration(t[0])
|
2018-09-29 17:50:49 +02:00
|
|
|
if err != nil {
|
|
|
|
return Zones{}, plugin.Error("file", err)
|
|
|
|
}
|
|
|
|
reload = d
|
2017-08-10 05:30:18 -07:00
|
|
|
case "upstream":
|
2019-07-02 16:23:47 +01:00
|
|
|
// remove soon
|
|
|
|
c.RemainingArgs()
|
2018-02-16 03:44:50 -05:00
|
|
|
|
2017-08-14 08:49:26 +01:00
|
|
|
default:
|
|
|
|
return Zones{}, c.Errf("unknown property '%s'", c.Val())
|
2017-08-10 05:30:18 -07:00
|
|
|
}
|
2016-03-18 20:57:35 +00:00
|
|
|
}
|
2019-07-18 14:56:59 +00:00
|
|
|
|
2021-12-10 00:43:10 +08:00
|
|
|
for i := range origins {
|
|
|
|
z[origins[i]].ReloadInterval = reload
|
|
|
|
z[origins[i]].Upstream = upstream.New()
|
|
|
|
}
|
2019-07-18 14:56:59 +00:00
|
|
|
}
|
|
|
|
|
2019-07-04 06:56:37 +01:00
|
|
|
if openErr != nil {
|
|
|
|
if reload == 0 {
|
|
|
|
// reload hasn't been set make this a fatal error
|
|
|
|
return Zones{}, plugin.Error("file", openErr)
|
|
|
|
}
|
|
|
|
log.Warningf("Failed to open %q: trying again in %s", openErr, reload)
|
|
|
|
}
|
2016-08-19 17:14:17 -07:00
|
|
|
return Zones{Z: z, Names: names}, nil
|
2016-03-18 20:57:35 +00:00
|
|
|
}
|