From 9bc72deba4d2107740084b05f415a766a62c6e06 Mon Sep 17 00:00:00 2001 From: Easwar Swaminathan Date: Tue, 2 Aug 2022 15:56:37 -0700 Subject: [PATCH] grpc: remove mentions of WithBalancerName from comments (#5555) --- service_config.go | 7 +++---- test/channelz_test.go | 2 -- vet.sh | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/service_config.go b/service_config.go index b01c548bb9a9..01bbb2025aed 100644 --- a/service_config.go +++ b/service_config.go @@ -57,10 +57,9 @@ type lbConfig struct { type ServiceConfig struct { serviceconfig.Config - // LB is the load balancer the service providers recommends. The balancer - // specified via grpc.WithBalancerName will override this. This is deprecated; - // lbConfigs is preferred. If lbConfig and LB are both present, lbConfig - // will be used. + // LB is the load balancer the service providers recommends. This is + // deprecated; lbConfigs is preferred. If lbConfig and LB are both present, + // lbConfig will be used. LB *string // lbConfig is the service config's load balancing configuration. If diff --git a/test/channelz_test.go b/test/channelz_test.go index ed8569bcd1a1..0633b0799fb2 100644 --- a/test/channelz_test.go +++ b/test/channelz_test.go @@ -1917,8 +1917,6 @@ func (s) TestCZTraceOverwriteChannelDeletion(t *testing.T) { czCleanup := channelz.NewChannelzStorageForTesting() defer czCleanupWrapper(czCleanup, t) e := tcpClearRREnv - // avoid newTest using WithBalancerName, which would override service - // config's change of balancer below. e.balancer = "" te := newTest(t, e) channelz.SetMaxTraceEntry(1) diff --git a/vet.sh b/vet.sh index ceb436c6ce47..c3fc8253b13a 100755 --- a/vet.sh +++ b/vet.sh @@ -147,7 +147,6 @@ grpc.NewGZIPDecompressor grpc.RPCCompressor grpc.RPCDecompressor grpc.ServiceConfig -grpc.WithBalancerName grpc.WithCompressor grpc.WithDecompressor grpc.WithDialer