Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-30 17:53:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/etcd: drop inflight (#1249)

Browse Source 
Use caching, just ask etcd for every query. This also improves
throughput because the single lock in inflght is bypassed.
This commit is contained in:
Miek Gieben
2017-11-26 17:21:24 +00:00
committed by GitHub
parent f621870d9c
commit 9d52b5acb9
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugin/etcd/etcd.go
View File

@@ -9,8 +9,6 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/etcd/msg"
"github.com/coredns/coredns/plugin/pkg/cache"
"github.com/coredns/coredns/plugin/pkg/singleflight"
"github.com/coredns/coredns/plugin/proxy"
"github.com/coredns/coredns/request"
@@ -28,7 +26,6 @@ type Etcd struct {
Proxy proxy.Proxy // Proxy for looking up names during the resolution process
Client etcdc.KeysAPI
Ctx context.Context
Inflight *singleflight.Group
Stubmap *map[string]proxy.Proxy // list of proxies for stub resolving.
endpoints []string // Stored here as well, to aid in testing.
@@ -84,24 +81,15 @@ func (e *Etcd) Records(state request.Request, exact bool) ([]msg.Service, error)
}
}
// get is a wrapper for client.Get that uses SingleInflight to suppress multiple outstanding queries.
// get is a wrapper for client.Get
func (e *Etcd) get(path string, recursive bool) (*etcdc.Response, error) {
hash := cache.Hash([]byte(path))
resp, err := e.Inflight.Do(hash, func() (interface{}, error) {
ctx, cancel := context.WithTimeout(e.Ctx, etcdTimeout)
defer cancel()
r, e := e.Client.Get(ctx, path, &etcdc.GetOptions{Sort: false, Recursive: recursive})
if e != nil {
return nil, e
}
return r, e
})
ctx, cancel := context.WithTimeout(e.Ctx, etcdTimeout)
defer cancel()
r, err := e.Client.Get(ctx, path, &etcdc.GetOptions{Sort: false, Recursive: recursive})
if err != nil {
return nil, err
}
return resp.(*etcdc.Response), err
return r, nil
}
// skydns/local/skydns/east/staging/web