Skip to content

Commit 55cd7a6

Browse files
authoredMar 15, 2024
channelz: major cleanup / reorganization (#6969)
1 parent a1033b1 commit 55cd7a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2467
-2791
lines changed
 

‎balancer/balancer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ type BuildOptions struct {
232232
// implementations which do not communicate with a remote load balancer
233233
// server can ignore this field.
234234
Authority string
235-
// ChannelzParentID is the parent ClientConn's channelz ID.
236-
ChannelzParentID *channelz.Identifier
235+
// ChannelzParent is the parent ClientConn's channelz channel.
236+
ChannelzParent channelz.Identifier
237237
// CustomUserAgent is the custom user agent set on the parent ClientConn.
238238
// The balancer should set the same custom user agent if it creates a
239239
// ClientConn.

‎balancer/grpclb/grpclb_remote_balancer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ func (lb *lbBalancer) newRemoteBalancerCCWrapper() error {
246246
// Explicitly set pickfirst as the balancer.
247247
dopts = append(dopts, grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"pick_first"}`))
248248
dopts = append(dopts, grpc.WithResolvers(lb.manualResolver))
249-
dopts = append(dopts, grpc.WithChannelzParentID(lb.opt.ChannelzParentID))
249+
dopts = append(dopts, grpc.WithChannelzParentID(lb.opt.ChannelzParent))
250250

251251
// Enable Keepalive for grpclb client.
252252
dopts = append(dopts, grpc.WithKeepaliveParams(keepalive.ClientParameters{

0 commit comments

Comments
 (0)