Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use miekg/dns for SRV lookup #1206

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions pkg/alertmanager/peers.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package alertmanager

import (
"net"
"time"

"github.com/cortexproject/cortex/pkg/util"
"github.com/go-kit/kit/log/level"
"github.com/miekg/dns"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down Expand Up @@ -34,7 +34,7 @@ type srvDiscovery struct {
service string
hostname string
pollInterval time.Duration
addresses chan []*net.SRV
addresses chan []*dns.SRV

stop chan struct{}
done chan struct{}
Expand All @@ -46,7 +46,7 @@ func newSRVDiscovery(service, hostname string, pollInterval time.Duration) *srvD
service: service,
hostname: hostname,
pollInterval: pollInterval,
addresses: make(chan []*net.SRV),
addresses: make(chan []*dns.SRV),
stop: make(chan struct{}),
done: make(chan struct{}),
}
Expand All @@ -61,8 +61,8 @@ func (s *srvDiscovery) Stop() {
}

func (s *srvDiscovery) updatePeers() {
var addrs []*net.SRV
_, addrs, err := net.LookupSRV(s.service, "tcp", s.hostname)
var addrs []*dns.SRV
addrs, err := util.LookupSRV(s.service, "tcp", s.hostname)
srvRequests.Inc()
if err != nil {
srvRequestFailures.Inc()
Expand Down
3 changes: 1 addition & 2 deletions pkg/chunk/cache/memcached_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cache
import (
"flag"
"fmt"
"net"
"sort"
"sync"
"time"
Expand Down Expand Up @@ -100,7 +99,7 @@ func (c *memcachedClient) updateLoop(updateInterval time.Duration) error {
// updateMemcacheServers sets a memcache server list from SRV records. SRV
// priority & weight are ignored.
func (c *memcachedClient) updateMemcacheServers() error {
_, addrs, err := net.LookupSRV(c.service, "tcp", c.hostname)
addrs, err := util.LookupSRV(c.service, "tcp", c.hostname)
if err != nil {
return err
}
Expand Down
67 changes: 67 additions & 0 deletions pkg/util/dns.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package util

import (
"fmt"
"net"

"github.com/go-kit/kit/log/level"
"github.com/miekg/dns"
)

const defaultResolvConf = "/etc/resolv.conf"

func getDefaultDNSServers(conf *dns.ClientConfig) []string {
servers := make([]string, 0, len(conf.Servers))
for _, server := range conf.Servers {
servers = append(servers, net.JoinHostPort(server, conf.Port))
}

return servers
}

// LookupSRV tries to resolve an SRV query of the given service, proto and domain name.
// proto can be 'tcp' or udp'.
// The query will be of the form _service._proto.name.
func LookupSRV(service, proto, name string) ([]*dns.SRV, error) {
conf, err := dns.ClientConfigFromFile(defaultResolvConf)
if err != nil {
return nil, err
}

dnsServers := getDefaultDNSServers(conf)

name = "_" + service + "._" + proto + "." + name
names := conf.NameList(name)

dnsResolved := false
client := dns.Client{}

for _, name := range names {
msg := &dns.Msg{}
msg.SetQuestion(dns.Fqdn(name), dns.TypeSRV)

var result []*dns.SRV
for _, serverAddr := range dnsServers {
resMsg, _, err := client.Exchange(msg, serverAddr)
if err != nil {
level.Warn(Logger).Log("msg", "DNS exchange failed", "err", err)
continue
}
dnsResolved = true
for _, ans := range resMsg.Answer {
if srvRecord, ok := ans.(*dns.SRV); ok {
result = append(result, srvRecord)
}
}
if len(result) > 0 {
return result, nil
}
}
}

if !dnsResolved {
return nil, fmt.Errorf("Couldn't resolve %s: No server responded", name)
}

return nil, nil
}