From 29adad9d713c49699aa06b073674a951ee22aee8 Mon Sep 17 00:00:00 2001 From: lyuxuan Date: Fri, 8 Mar 2019 15:17:55 -0800 Subject: [PATCH] edsbalancer: fix address format (#2675) --- balancer/xds/edsbalancer/edsbalancer.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/balancer/xds/edsbalancer/edsbalancer.go b/balancer/xds/edsbalancer/edsbalancer.go index 8b59c2cf..ebdde63b 100644 --- a/balancer/xds/edsbalancer/edsbalancer.go +++ b/balancer/xds/edsbalancer/edsbalancer.go @@ -21,7 +21,9 @@ import ( "context" "encoding/json" "fmt" + "net" "reflect" + "strconv" "sync" xdspb "github.com/envoyproxy/go-control-plane/envoy/api/v2" @@ -206,7 +208,7 @@ func (xdsB *EDSBalancer) HandleEDSResponse(edsResp *xdspb.ClusterLoadAssignment) for _, lbEndpoint := range locality.GetLbEndpoints() { socketAddress := lbEndpoint.GetEndpoint().GetAddress().GetSocketAddress() newAddrs = append(newAddrs, resolver.Address{ - Addr: fmt.Sprintf("%s:%d", socketAddress.GetAddress(), socketAddress.GetPortValue()), + Addr: net.JoinHostPort(socketAddress.GetAddress(), strconv.Itoa(int(socketAddress.GetPortValue()))), }) } var weightChanged, addrsChanged bool