ffffffffff

Author: lyuxuan

balancer/xds/xds.go

@@ -219,6 +219,9 @@ func (x *xdsBalancer) run() {
 
 func getBalancerConfig(serviceConfig string) *xdsConfig {
 	sc := parseFullServiceConfig(serviceConfig)
+	if sc == nil {
+		return nil
+	}
 	var xdsConfigRaw json.RawMessage
 	for _, lbcfg := range sc.LoadBalancingConfig {
 		if lbcfg.Name == xdsName {

balancer/xds/xds_test.go

@@ -290,7 +290,7 @@ func (s) TestXdsBalanceHandleResolvedAddrs(t *testing.T) {
 				t.Fatalf("got new subconn address %v, want %v", nsc, append(addrs, specialAddrForBalancerA))
 			}
 		case <-time.After(2 * time.Second):
-			t.Fatal("timeout when geting new subconn result", i)
+			t.Fatal("timeout when geting new subconn result")
 		}
 		addrs = addrs[:2-i]
 	}