Skip to content

cdsbalancer: Remove UpdateAddresses handling #8811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arjan-bal merged 2 commits into from
Jan 16, 2026
Merged

cdsbalancer: Remove UpdateAddresses handling #8811

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c332f
Remove UpdateAddresses from CDS balancer
arjan-bal Jan 6, 2026
118a850
Merge remote-tracking branch 'source/master' into cds-remove-update-a…
arjan-bal Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions internal/xds/balancer/cdsbalancer/cdsbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,12 @@ func (bb) Build(cc balancer.ClientConn, opts balancer.BuildOptions) balancer.Bal
xdsHIPtr: &xdsHIPtr,
watchers: make(map[string]*watcherState),
}
b.logger = prefixLogger(b)
b.ccw = &ccWrapper{
ClientConn: cc,
xdsHIPtr: b.xdsHIPtr,
logger: b.logger,
}
b.logger = prefixLogger(b)
b.logger.Infof("Created")

var creds credentials.TransportCredentials
Expand Down Expand Up @@ -681,6 +682,7 @@ type ccWrapper struct {
balancer.ClientConn

xdsHIPtr *unsafe.Pointer
logger *grpclog.PrefixLogger
}

// NewSubConn intercepts NewSubConn() calls from the child policy and adds an
Expand All @@ -697,12 +699,8 @@ func (ccw *ccWrapper) NewSubConn(addrs []resolver.Address, opts balancer.NewSubC
return ccw.ClientConn.NewSubConn(newAddrs, opts)
}

func (ccw *ccWrapper) UpdateAddresses(sc balancer.SubConn, addrs []resolver.Address) {
newAddrs := make([]resolver.Address, len(addrs))
for i, addr := range addrs {
newAddrs[i] = xdsinternal.SetHandshakeInfo(addr, ccw.xdsHIPtr)
}
ccw.ClientConn.UpdateAddresses(sc, newAddrs)
func (ccw *ccWrapper) UpdateAddresses(sc balancer.SubConn, _ []resolver.Address) {
ccw.logger.Errorf("UpdateAddresses(%v) called unexpectedly", sc)
}

// systemRootCertsProvider implements a certprovider.Provider that returns the
Expand Down