From e717f2ad6c55d14f07d60b2544127e0bdcc5c16a Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 23 Dec 2021 17:14:59 +0100 Subject: [PATCH] grpcutil: Remove load balancer references Signed-off-by: Arve Knudsen --- grpcutil/dns_resolver.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/grpcutil/dns_resolver.go b/grpcutil/dns_resolver.go index 7be27c5f9..898403510 100644 --- a/grpcutil/dns_resolver.go +++ b/grpcutil/dns_resolver.go @@ -201,12 +201,12 @@ func (w *dnsWatcher) lookupSRV() map[string]*Update { return nil } for _, s := range srvs { - lbAddrs, err := lookupHost(w.ctx, s.Target) + addrs, err := lookupHost(w.ctx, s.Target) if err != nil { - level.Warn(w.logger).Log("msg", "failed load balancer address DNS lookup", "err", err) + level.Warn(w.logger).Log("msg", "failed SRV target DNS lookup", "target", s.Target, "err", err) continue } - for _, a := range lbAddrs { + for _, a := range addrs { a, ok := formatIP(a) if !ok { level.Error(w.logger).Log("failed IP parsing", "err", err) @@ -241,8 +241,7 @@ func (w *dnsWatcher) lookupHost() map[string]*Update { func (w *dnsWatcher) lookup() []*Update { newAddrs := w.lookupSRV() if newAddrs == nil { - // If we failed to get any balancer address (either no corresponding SRV for the - // target, or caused by failure during resolution/parsing of the balancer target), + // If we failed to get any valid addresses from SRV record lookup, // return any A record info available. newAddrs = w.lookupHost() }