Clean up

src/core/ext/filters/client_channel/health/health_check_parser.h

@@ -1,52 +0,0 @@
-/*
- *
- * Copyright 2019 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HEALTH_HEALTH_CHECK_PARSER_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HEALTH_HEALTH_CHECK_PARSER_H
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/filters/client_channel/service_config.h"
-
-namespace grpc_core {
-#if 0
-class HealthCheckParsedObject : public ServiceConfig::ParsedConfig {
- public:
-  HealthCheckParsedObject(const char* service_name)
-      : service_name_(service_name) {}
-
-  // Returns the service_name found in the health check config. The lifetime of
-  // the string is tied to the lifetime of the ServiceConfig object.
-  const char* service_name() const { return service_name_; }
-
- private:
-  const char* service_name_;
-};
-
-class HealthCheckParser : public ServiceConfig::Parser {
- public:
-  UniquePtr<ServiceConfig::ParsedConfig> ParseGlobalParams(
-      const grpc_json* json, grpc_error** error) override;
-
-  static void Register();
-
-  static size_t ParserIndex();
-};
-#endif
-}  // namespace grpc_core
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HEALTH_HEALTH_CHECK_PARSER_H */

src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc

@@ -1143,13 +1143,13 @@ void GrpcLb::BalancerCallState::OnBalancerStatusReceivedLocked(
   // we want to retry connecting. Otherwise, we have deliberately ended this
   // call and no further action is required.
   if (lb_calld == grpclb_policy->lb_calld_.get()) {
-    // If we did not receive a serverlist and the fallback-at-startup checks
+    // If the fallback-at-startup checks are pending, go into fallback mode
-    // are pending, go into fallback mode immediately.  This short-circuits
+    // immediately.  This short-circuits the timeout for the fallback-at-startup
-    // the timeout for the fallback-at-startup case.
+    // case.
-    if (!lb_calld->seen_serverlist_ &&
+    if (grpclb_policy->fallback_at_startup_checks_pending_) {
-        grpclb_policy->fallback_at_startup_checks_pending_) {
+      GPR_ASSERT(!lb_calld->seen_serverlist_);
       gpr_log(GPR_INFO,
-              "[grpclb %p] balancer call finished without receiving "
+              "[grpclb %p] Balancer call finished without receiving "
               "serverlist; entering fallback mode",
               grpclb_policy);
       grpclb_policy->fallback_at_startup_checks_pending_ = false;
@@ -1820,7 +1820,6 @@ class GrpcLbFactory : public LoadBalancingPolicyFactory {
         if (child_policy != nullptr) {
           error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
               "field:childPolicy error:Duplicate entry"));
-          continue;
         }
         grpc_error* parse_error = GRPC_ERROR_NONE;
         child_policy = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig(

src/core/ext/filters/client_channel/lb_policy/xds/xds.cc

@@ -1849,7 +1849,8 @@ void XdsLb::LocalityMap::LocalityEntry::UpdateLocked(
   // Construct update args.
   UpdateArgs update_args;
   update_args.addresses = ProcessServerlist(serverlist);
-  update_args.config = child_policy_config->Ref();
+  update_args.config =
+      child_policy_config == nullptr ? nullptr : child_policy_config->Ref();
   update_args.args = CreateChildPolicyArgsLocked(args_in);
   // If the child policy name changes, we need to create a new child
   // policy.  When this happens, we leave child_policy_ as-is and store
@@ -2183,7 +2184,6 @@ class XdsFactory : public LoadBalancingPolicyFactory {
         if (balancer_name != nullptr) {
           error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
               "field:balancerName error:Duplicate entry"));
-          continue;
         }
         if (field->type != GRPC_JSON_STRING) {
           error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
@@ -2195,7 +2195,6 @@ class XdsFactory : public LoadBalancingPolicyFactory {
         if (child_policy != nullptr) {
           error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
               "field:childPolicy error:Duplicate entry"));
-          continue;
         }
         grpc_error* parse_error = GRPC_ERROR_NONE;
         child_policy = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig(
@@ -2208,7 +2207,6 @@ class XdsFactory : public LoadBalancingPolicyFactory {
         if (fallback_policy != nullptr) {
           error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
               "field:fallbackPolicy error:Duplicate entry"));
-          continue;
         }
         grpc_error* parse_error = GRPC_ERROR_NONE;
         fallback_policy = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig(

src/core/ext/filters/message_size/message_size_filter.cc

@@ -336,7 +336,7 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem,
   // client_channel filter.) If we ever need a second filter that also needs to
   // parse GRPC_ARG_SERVICE_CONFIG, we should refactor this code and add a
   // separate filter that reads GRPC_ARG_SERVICE_CONFIG and saves the parsed
-  // config in the call_context. Get service config from channel args.
+  // config in the call_context.
   const grpc_arg* channel_arg =
       grpc_channel_args_find(args->channel_args, GRPC_ARG_SERVICE_CONFIG);
   const char* service_config_str = grpc_channel_arg_get_string(channel_arg);