Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-01 02:33:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Scrub: use binary search (#1543)

Browse Source 
Use binary search to find the minimal message size, that contains whole
RRs and fits the client's buffer. This is better then just setting
entire sections to `nil`. Extend the tests to test for additional and
answer section truncation. In the first case we *don't* set the TC bit.

This function now also set Compression to true.
This commit is contained in:
Miek Gieben
2018-02-21 21:13:41 +00:00
committed by GitHub
parent aa2302e3f4
commit 074d176f03
2 changed files with 101 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
request/request_test.go
View File

@@ -61,7 +61,7 @@ func TestRequestMalformed(t *testing.T) {
}
}
func TestRequestScrub(t *testing.T) {
func TestRequestScrubAnswer(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("large.example.com.", dns.TypeSRV)
req := Request{W: &test.ResponseWriter{}, Req: m}
@@ -69,24 +69,46 @@ func TestRequestScrub(t *testing.T) {
reply := new(dns.Msg)
reply.SetReply(m)
for i := 1; i < 200; i++ {
reply.Answer = append(reply.Answer, test.SRV(fmt.Sprintf(
"large.example.com. 10 IN SRV 0 0 80 10-0-0-%d.default.pod.k8s.example.com.",
i,
)))
reply.Answer = append(reply.Answer, test.SRV(
fmt.Sprintf("large.example.com. 10 IN SRV 0 0 80 10-0-0-%d.default.pod.k8s.example.com.", i)))
}
msg, got := req.Scrub(reply)
if want := ScrubDone; want != got {
_, got := req.Scrub(reply)
if want := ScrubAnswer; want != got {
t.Errorf("want scrub result %d, got %d", want, got)
}
if want, got := req.Size(), msg.Len(); want < got {
if want, got := req.Size(), reply.Len(); want < got {
t.Errorf("want scrub to reduce message length below %d bytes, got %d bytes", want, got)
}
if !msg.Truncated {
if !reply.Truncated {
t.Errorf("want scrub to set truncated bit")
}
}
func TestRequestScrubExtra(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("large.example.com.", dns.TypeSRV)
req := Request{W: &test.ResponseWriter{}, Req: m}
reply := new(dns.Msg)
reply.SetReply(m)
for i := 1; i < 200; i++ {
reply.Extra = append(reply.Extra, test.SRV(
fmt.Sprintf("large.example.com. 10 IN SRV 0 0 80 10-0-0-%d.default.pod.k8s.example.com.", i)))
}
_, got := req.Scrub(reply)
if want := ScrubExtra; want != got {
t.Errorf("want scrub result %d, got %d", want, got)
}
if want, got := req.Size(), reply.Len(); want < got {
t.Errorf("want scrub to reduce message length below %d bytes, got %d bytes", want, got)
}
if reply.Truncated {
t.Errorf("want scrub to not set truncated bit")
}
}
func BenchmarkRequestDo(b *testing.B) {
st := testRequest()