fix linter errors, remove UnmarshalJSON method from LB config

Author: s-matyukevich

balancer/deterministicsubsetting/balancer.go

@@ -101,9 +101,9 @@ func (b *subsettingBalancer) prepareChildResolverState(s resolver.State) resolve
 		addresses[i], addresses[j] = addresses[j], addresses[i]
 	})
 
-	subsetId := clientIndex % subsetCount
+	subsetID := clientIndex % subsetCount
 
-	start := int(subsetId * int(b.cfg.SubsetSize))
+	start := int(subsetID * int(b.cfg.SubsetSize))
 	end := start + int(b.cfg.SubsetSize)
 
 	b.logger.Infof("resulting subset: %v", addresses[start:end])

balancer/deterministicsubsetting/config.go

@@ -19,8 +19,6 @@
 package deterministicsubsetting
 
 import (
-	"encoding/json"
-
 	iserviceconfig "google.golang.org/grpc/internal/serviceconfig"
 	"google.golang.org/grpc/serviceconfig"
 )
@@ -35,17 +33,3 @@ type LBConfig struct {
 
 	ChildPolicy *iserviceconfig.BalancerConfig `json:"child_policy,omitempty"`
 }
-
-// For UnmarshalJSON to work correctly and set defaults without infinite
-// recursion.
-type lbConfig LBConfig
-
-func (lbc *LBConfig) UnmarshalJSON(j []byte) error {
-	// Default top layer values.
-	lbc.SubsetSize = 10
-	// Unmarshal JSON on a type with zero values for methods, including
-	// UnmarshalJSON. Overwrites defaults, leaves alone if not. typecast to
-	// avoid infinite recursion by not recalling this function and causing stack
-	// overflow.
-	return json.Unmarshal(j, (*lbConfig)(lbc))
-}

balancer/deterministicsubsetting/e2e_test/subsetting_test.go

@@ -141,7 +141,7 @@ func checkRoundRobinRPCs(t *testing.T, ctx context.Context, clients []testgrpc.T
 				} else if _, ok := m[clientIdx]; !ok {
 					m[clientIdx] = struct{}{}
 				} else {
-					// The backend recieves a second request from the same client. This could happen if the client have 1 backend in READY
+					// The backend receives a second request from the same client. This could happen if the client have 1 backend in READY
 					// state while the other  are CONNECTING. In this case round_robbin will pick the same address twice.
 					// We are going to retry after short timeout.
 					time.Sleep(10 * time.Microsecond)