grpc: do not apply default service config upon receipt of invalid service config

clientconn.go

@@ -653,13 +653,11 @@ func (cc *ClientConn) updateResolverState(s resolver.State, err error) error {
 		} else {
 			ret = balancer.ErrBadResolverState
 			if cc.sc == nil {
-				if cc.dopts.defaultServiceConfig != nil {
-					cc.applyServiceConfigAndBalancer(cc.dopts.defaultServiceConfig, &defaultConfigSelector{cc.dopts.defaultServiceConfig}, s.Addresses)
-				} else {
-					cc.applyFailingLB(s.ServiceConfig)
-					cc.mu.Unlock()
-					return ret
-				}
+				// Apply the failing LB only if we haven't received valid service config
+				// from the name resolver in the past.
+				cc.applyFailingLB(s.ServiceConfig)
+				cc.mu.Unlock()
+				return ret
 			}
 		}
 	}

service_config.go

@@ -381,6 +381,9 @@ func init() {
 //
 // If any of them is NOT *ServiceConfig, return false.
 func equalServiceConfig(a, b serviceconfig.Config) bool {
+	if a == nil && b == nil {
+		return true
+	}
 	aa, ok := a.(*ServiceConfig)
 	if !ok {
 		return false

test/resolver_test.go → test/config_selector_test.go

@@ -211,5 +211,4 @@ func (s) TestConfigSelector(t *testing.T) {
 			}
 		})
 	}
-
 }