Skip to content

Commit 999e703

Browse files
committed
resolver: less debug
Observed lots of debug messages from resolver (and associated high CPU usage because of lots of logging) when debug logging is turned on. Here is some data from a real system: > $ journalctl -u docker --since="2019-10-21 21:00:00" --until="2019-10-21 22:00:00" | wc -l > 188621 > $ journalctl -u docker --since="2019-10-21 21:00:00" --until="2019-10-21 22:00:00" | grep -E 'Name To resolve: |\[resolver\] ' | wc -l > 186319 So, it was about 200000 lines logger for just one hour, and about 99% of that are from resolver. While this might be the peculiarity of a particular setup, the number of such messages still seem way too excessive. Remove the ones that are not errors. Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 79c19d0 commit 999e703

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

resolver.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ func (r *resolver) handleIPQuery(name string, query *dns.Msg, ipType int) (*dns.
255255
return nil, nil
256256
}
257257

258-
logrus.Debugf("[resolver] lookup for %s: IP %v", name, addr)
259-
260258
resp := createRespMsg(query)
261259
if len(addr) > 1 {
262260
addr = shuffleAddr(addr)
@@ -296,7 +294,6 @@ func (r *resolver) handlePTRQuery(ptr string, query *dns.Msg) (*dns.Msg, error)
296294
return nil, nil
297295
}
298296

299-
logrus.Debugf("[resolver] lookup for IP %s: name %s", parts[0], host)
300297
fqdn := dns.Fqdn(host)
301298

302299
resp := new(dns.Msg)
@@ -452,9 +449,6 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) {
452449
logrus.Warnf("[resolver] connect failed: %s", err)
453450
continue
454451
}
455-
queryType := dns.TypeToString[query.Question[0].Qtype]
456-
logrus.Debugf("[resolver] query %s (%s) from %s, forwarding to %s:%s", name, queryType,
457-
extConn.LocalAddr().String(), proto, extDNS.IPStr)
458452

459453
// Timeout has to be set for every IO operation.
460454
extConn.SetDeadline(time.Now().Add(extIOTimeout))
@@ -522,18 +516,13 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) {
522516
case dns.TypeA:
523517
answers++
524518
ip := rr.(*dns.A).A
525-
logrus.Debugf("[resolver] received A record %q for %q from %s:%s", ip, h.Name, proto, extDNS.IPStr)
526519
r.backend.HandleQueryResp(h.Name, ip)
527520
case dns.TypeAAAA:
528521
answers++
529522
ip := rr.(*dns.AAAA).AAAA
530-
logrus.Debugf("[resolver] received AAAA record %q for %q from %s:%s", ip, h.Name, proto, extDNS.IPStr)
531523
r.backend.HandleQueryResp(h.Name, ip)
532524
}
533525
}
534-
if resp.Answer == nil || answers == 0 {
535-
logrus.Debugf("[resolver] external DNS %s:%s did not return any %s records for %q", proto, extDNS.IPStr, queryType, name)
536-
}
537526
resp.Compress = true
538527
break
539528
}

sandbox.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,6 @@ func (sb *sandbox) ResolveName(name string, ipType int) ([]net.IP, bool) {
529529
// {a.b in network c.d},
530530
// {a in network b.c.d},
531531

532-
logrus.Debugf("Name To resolve: %v", name)
533532
name = strings.TrimSuffix(name, ".")
534533
reqName := []string{name}
535534
networkName := []string{""}

0 commit comments

Comments
 (0)