From 4e5ef5b6280b58a58246a9beffa6b1a91ab3a502 Mon Sep 17 00:00:00 2001 From: Jonathan Nobels Date: Tue, 2 Jul 2024 14:22:13 -0400 Subject: [PATCH] net/dns: fix broken dns benchmark tests (#12686) Updates tailscale/corp#20677 The recover function wasn't getting set in the benchmark tests. Default changed to an empty func. Signed-off-by: Jonathan Nobels --- net/dns/resolver/forwarder.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/dns/resolver/forwarder.go b/net/dns/resolver/forwarder.go index c1c2a05d6..ca3227aab 100644 --- a/net/dns/resolver/forwarder.go +++ b/net/dns/resolver/forwarder.go @@ -224,11 +224,12 @@ func newForwarder(logf logger.Logf, netMon *netmon.Monitor, linkSel ForwardLinkS panic("nil netMon") } f := &forwarder{ - logf: logger.WithPrefix(logf, "forward: "), - netMon: netMon, - linkSel: linkSel, - dialer: dialer, - controlKnobs: knobs, + logf: logger.WithPrefix(logf, "forward: "), + netMon: netMon, + linkSel: linkSel, + dialer: dialer, + controlKnobs: knobs, + missingUpstreamRecovery: func() {}, } f.ctx, f.ctxCancel = context.WithCancel(context.Background()) return f