luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

GH-3798: Wrap DNS request validation in a retry

This commit is contained in:
Matt Keeler 2018-04-11 16:00:15 -04:00
parent 059d0f07de
commit 300f7f388e
1 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
agent/dns_test.go
View File

@ -1925,34 +1925,42 @@ func TestDNS_PreparedQueryNearIP(t *testing.T) {
err := a.RPC("PreparedQuery.Apply", args, &id) err := a.RPC("PreparedQuery.Apply", args, &id)
require.NoError(t, err) require.NoError(t, err)
} }
retry.Run(t, func(r *retry.R) {
m :=new(dns.Msg) m :=new(dns.Msg)
m.SetQuestion("some.query.we.like.query.consul.", dns.TypeA) m.SetQuestion("some.query.we.like.query.consul.", dns.TypeA)
m.SetEdns0(4096, false) m.SetEdns0(4096, false)
o := new(dns.OPT) o := new(dns.OPT)
o.Hdr.Name = "." o.Hdr.Name = "."
o.Hdr.Rrtype = dns.TypeOPT o.Hdr.Rrtype = dns.TypeOPT
e := new(dns.EDNS0_SUBNET) e := new(dns.EDNS0_SUBNET)
e.Code = dns.EDNS0SUBNET e.Code = dns.EDNS0SUBNET
e.Family = 1 e.Family = 1
e.SourceNetmask = 32 e.SourceNetmask = 32
e.SourceScope = 0 e.SourceScope = 0
e.Address = net.ParseIP("198.18.0.9").To4() e.Address = net.ParseIP("198.18.0.9").To4()
o.Option = append(o.Option, e) o.Option = append(o.Option, e)
m.Extra = append(m.Extra, o) m.Extra = append(m.Extra, o)
c := new(dns.Client) c := new(dns.Client)
in, _, err := c.Exchange(m, a.DNSAddr()) in, _, err := c.Exchange(m, a.DNSAddr())
require.NoErrorf(t, err, "Error with call to dns.Client.Exchange: %s", err) if err != nil {
r.Fatalf("Error with call to dns.Client.Exchange: %s", err)
require.Equalf(t, len(serviceNodes), len(in.Answer), "Expecting %d A RRs in response, Actual found was %d", len(serviceNodes), len(in.Answer)) }
for i, rr := range in.Answer { if len(serviceNodes) != len(in.Answer) {
aRec, ok := rr.(*dns.A); r.Fatalf("Expecting %d A RRs in response, Actual found was %d", len(serviceNodes), len(in.Answer))
require.Truef(t, ok, "DNS Answer contained a non A RR") }
actual := aRec.A.String()
require.Equalf(t, serviceNodes[i].address, actual, "Expecting A RR #%d = %s, Actual RR was %s", i, serviceNodes[i].address, actual) for i, rr := range in.Answer {
} if aRec, ok := rr.(*dns.A); ok {
if actual := aRec.A.String(); serviceNodes[i].address != actual {
r.Fatalf("Expecting A RR #%d = %s, Actual RR was %s", i, serviceNodes[i].address, actual)
}
} else {
r.Fatalf("DNS Answer container a non-A RR")
}
}
})
} }
func TestDNS_ServiceLookup_PreparedQueryNamePeriod(t *testing.T) { func TestDNS_ServiceLookup_PreparedQueryNamePeriod(t *testing.T) {