Address review comments (2/x).

balancer/balancer.go

@@ -72,9 +72,10 @@ func unregisterForTesting(name string) {
  delete(m, name)
 }
 
-// getConnectedAddress returns the connected address for a SubConnState and
-// whether or not it is valid.
-func getConnectedAddress(scs SubConnState) (resolver.Address, bool) {
+// connectedAddress returns the connected address for a SubConnState.
+// The second return value is set to to false if the state is not READY, and the
+// first return value is meaningless in this case.
+func connectedAddress(scs SubConnState) (resolver.Address, bool) {
  return scs.connectedAddress, scs.ConnectivityState == connectivity.Ready
 }
 
@@ -85,7 +86,7 @@ func setConnectedAddress(scs *SubConnState, addr resolver.Address) {
 
 func init() {
  internal.BalancerUnregister = unregisterForTesting
- internal.GetConnectedAddress = getConnectedAddress
+ internal.ConnectedAddress = connectedAddress
  internal.SetConnectedAddress = setConnectedAddress
 }
 

clientconn.go

@@ -24,6 +24,7 @@ import (
  "fmt"
  "math"
  "net/url"
+ "slices"
  "strings"
  "sync"
  "sync/atomic"
@@ -918,22 +919,18 @@ func (ac *addrConn) connect() error {
  return nil
 }
 
+// equalAddress returns true is a and b are considered equal.
+// This is different from the Equal method on the resolver.Address type which
+// considers all fields to determine equality. Here, we only consider fields
+// that are meaningful to the subConn.
 func equalAddress(a, b resolver.Address) bool {
  return a.Addr == b.Addr && a.ServerName == b.ServerName &&
  a.Attributes.Equal(b.Attributes) &&
  a.Metadata == b.Metadata
 }
 
 func equalAddresses(a, b []resolver.Address) bool {
- if len(a) != len(b) {
- return false
- }
- for i, v := range a {
- if !equalAddress(v, b[i]) {
- return false
- }
- }
- return true
+ return slices.EqualFunc(a, b, func(a, b resolver.Address) bool { return equalAddress(a, b) })
 }
 
 // updateAddrs updates ac.addrs with the new addresses list and handles active

internal/internal.go

@@ -209,9 +209,10 @@ var (
  // is the number of elements. swap swaps the elements with indexes i and j.
  ShuffleAddressListForTesting any // func(n int, swap func(i, j int))
 
- // GetConnectedAddress returns the connected address for a SubConnState and
- // whether the address is valid based on the state.
- GetConnectedAddress any // func (scs SubConnState) (resolver.Address, bool)
+ // ConnectedAddress returns the connected address for a SubConnState.
+// The second return value is set to to false if the state is not READY, and the
+// first return value is meaningless in this case.
+ ConnectedAddress any // func (scs SubConnState) (resolver.Address, bool)
 
  // SetConnectedAddress sets the connected address for a SubConnState.
  SetConnectedAddress any // func(scs *SubConnState, addr resolver.Address)

xds/internal/balancer/clusterimpl/clusterimpl.go

@@ -371,13 +371,13 @@
  b.updateSubConnState(sc, state, oldListener)
  // Read connected address and call updateLocalityID() based on the connected
  // address's locality. https://github.com/grpc/grpc-go/issues/7339
- if gca, ok := internal.GetConnectedAddress.(func(balancer.SubConnState) (resolver.Address, bool)); ok {
+ if gca, ok := internal.ConnectedAddress.(func(balancer.SubConnState) (resolver.Address, bool)); ok {
  if addr, ok := gca(state); ok {
  lID := xdsinternal.GetLocalityID(addr)
  if !lID.Empty() {
  scw.updateLocalityID(lID)
  } else if b.logger.V(2) {
- b.logger.Infof("Locality ID for %v unexpectedly empty", addr)
+ b.logger.Infof("Locality ID for %s unexpectedly empty", addr)
  }
  }
  }

xds/internal/internal.go

@@ -57,7 +57,7 @@ func (l LocalityID) Equal(o any) bool {
 
 // Empty returns whether or not the locality ID is empty.
 func (l LocalityID) Empty() bool {
- return len(l.Region) == 0 && len(l.Zone) == 0 && len(l.SubZone) == 0
+ return l.Region == "" && l.Zone == "" && l.SubZone == ""
 }
 
 // LocalityIDFromString converts a json representation of locality, into a