grpc 1.28.0.pre2 → 1.31.0.pre1

data/src/core/ext/filters/client_channel/subchannel.h

@@ -21,6 +21,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <deque>
+
 #include "src/core/ext/filters/client_channel/client_channel_channelz.h"
 #include "src/core/ext/filters/client_channel/connector.h"
 #include "src/core/ext/filters/client_channel/subchannel_pool_interface.h"
@@ -176,24 +178,44 @@ class SubchannelCall {
 class Subchannel {
  public:
   class ConnectivityStateWatcherInterface
-      : public InternallyRefCounted<ConnectivityStateWatcherInterface> {
+      : public RefCounted<ConnectivityStateWatcherInterface> {
    public:
+    struct ConnectivityStateChange {
+      grpc_connectivity_state state;
+      RefCountedPtr<ConnectedSubchannel> connected_subchannel;
+    };
+
     virtual ~ConnectivityStateWatcherInterface() = default;
 
     // Will be invoked whenever the subchannel's connectivity state
     // changes.  There will be only one invocation of this method on a
     // given watcher instance at any given time.
-    //
+    // Implementations should call PopConnectivityStateChange to get the next
+    // connectivity state change.
+    virtual void OnConnectivityStateChange() = 0;
+
+    virtual grpc_pollset_set* interested_parties() = 0;
+
+    // Enqueues connectivity state change notifications.
     // When the state changes to READY, connected_subchannel will
     // contain a ref to the connected subchannel.  When it changes from
     // READY to some other state, the implementation must release its
     // ref to the connected subchannel.
-    virtual void OnConnectivityStateChange(
-        grpc_connectivity_state new_state,
-        RefCountedPtr<ConnectedSubchannel> connected_subchannel)  // NOLINT
-        = 0;
+    // TODO(yashkt): This is currently needed to send the state updates in the
+    // right order when asynchronously notifying. This will no longer be
+    // necessary when we have access to EventManager.
+    void PushConnectivityStateChange(ConnectivityStateChange state_change);
 
-    virtual grpc_pollset_set* interested_parties() = 0;
+    // Dequeues connectivity state change notifications.
+    ConnectivityStateChange PopConnectivityStateChange();
+
+   private:
+    // Keeps track of the updates that the watcher instance must be notified of.
+    // TODO(yashkt): This is currently needed to send the state updates in the
+    // right order when asynchronously notifying. This will no longer be
+    // necessary when we have access to EventManager.
+    std::deque<ConnectivityStateChange> connectivity_state_queue_;
+    Mutex mu_;  // protects the queue
   };
 
   // The ctor and dtor are not intended to use directly.
@@ -243,7 +265,7 @@ class Subchannel {
   void WatchConnectivityState(
       grpc_connectivity_state initial_state,
       grpc_core::UniquePtr<char> health_check_service_name,
-      OrphanablePtr<ConnectivityStateWatcherInterface> watcher);
+      RefCountedPtr<ConnectivityStateWatcherInterface> watcher);
 
   // Cancels a connectivity state watch.
   // If the watcher has already been destroyed, this is a no-op.
@@ -280,7 +302,7 @@ class Subchannel {
     ~ConnectivityStateWatcherList() { Clear(); }
 
     void AddWatcherLocked(
-        OrphanablePtr<ConnectivityStateWatcherInterface> watcher);
+        RefCountedPtr<ConnectivityStateWatcherInterface> watcher);
     void RemoveWatcherLocked(ConnectivityStateWatcherInterface* watcher);
 
     // Notifies all watchers in the list about a change to state.
@@ -294,7 +316,7 @@ class Subchannel {
     // TODO(roth): Once we can use C++-14 heterogeneous lookups, this can
     // be a set instead of a map.
     std::map<ConnectivityStateWatcherInterface*,
-             OrphanablePtr<ConnectivityStateWatcherInterface>>
+             RefCountedPtr<ConnectivityStateWatcherInterface>>
         watchers_;
   };
 
@@ -312,7 +334,7 @@ class Subchannel {
     void AddWatcherLocked(
         Subchannel* subchannel, grpc_connectivity_state initial_state,
         grpc_core::UniquePtr<char> health_check_service_name,
-        OrphanablePtr<ConnectivityStateWatcherInterface> watcher);
+        RefCountedPtr<ConnectivityStateWatcherInterface> watcher);
     void RemoveWatcherLocked(const char* health_check_service_name,
                              ConnectivityStateWatcherInterface* watcher);
 
@@ -332,6 +354,8 @@ class Subchannel {
 
   class ConnectedSubchannelStateWatcher;
 
+  class AsyncWatcherNotifierLocked;
+
   // Sets the subchannel's connectivity state to \a state.
   void SetConnectivityStateLocked(grpc_connectivity_state state);
 

data/src/core/ext/filters/client_channel/xds/xds_api.cc

@@ -23,13 +23,20 @@
 #include <cstdlib>
 
 #include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_split.h"
+
+#include "upb/upb.hpp"
 
 #include <grpc/impl/codegen/log.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 
 #include "src/core/ext/filters/client_channel/xds/xds_api.h"
-#include "src/core/lib/gprpp/inlined_vector.h"
+#include "src/core/lib/gpr/env.h"
+#include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/sockaddr_utils.h"
 
@@ -48,7 +55,9 @@
 #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.h"
 #include "envoy/config/listener/v2/api_listener.upb.h"
 #include "envoy/service/load_stats/v2/lrs.upb.h"
+#include "envoy/type/matcher/regex.upb.h"
 #include "envoy/type/percent.upb.h"
+#include "envoy/type/range.upb.h"
 #include "google/protobuf/any.upb.h"
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/struct.upb.h"
@@ -125,8 +134,99 @@ const char* XdsApi::kCdsTypeUrl = "type.googleapis.com/envoy.api.v2.Cluster";
 const char* XdsApi::kEdsTypeUrl =
     "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment";
 
-XdsApi::XdsApi(const XdsBootstrap::Node* node)
-    : node_(node),
+std::string XdsApi::RdsUpdate::RdsRoute::Matchers::PathMatcher::ToString()
+    const {
+  std::string path_type_string;
+  switch (type) {
+    case PathMatcherType::PATH:
+      path_type_string = "path match";
+      break;
+    case PathMatcherType::PREFIX:
+      path_type_string = "prefix match";
+      break;
+    case PathMatcherType::REGEX:
+      path_type_string = "regex match";
+      break;
+    default:
+      break;
+  }
+  return absl::StrFormat("Path %s:/%s/", path_type_string,
+                         type == PathMatcherType::REGEX
+                             ? regex_matcher->pattern()
+                             : string_matcher);
+}
+
+std::string XdsApi::RdsUpdate::RdsRoute::Matchers::HeaderMatcher::ToString()
+    const {
+  switch (type) {
+    case HeaderMatcherType::EXACT:
+      return absl::StrFormat("Header exact match:%s %s:%s",
+                             invert_match ? " not" : "", name, string_matcher);
+    case HeaderMatcherType::REGEX:
+      return absl::StrFormat("Header regex match:%s %s:%s",
+                             invert_match ? " not" : "", name,
+                             regex_match->pattern());
+    case HeaderMatcherType::RANGE:
+      return absl::StrFormat("Header range match:%s %s:[%d, %d)",
+                             invert_match ? " not" : "", name, range_start,
+                             range_end);
+    case HeaderMatcherType::PRESENT:
+      return absl::StrFormat("Header present match:%s %s:%s",
+                             invert_match ? " not" : "", name,
+                             present_match ? "true" : "false");
+    case HeaderMatcherType::PREFIX:
+      return absl::StrFormat("Header prefix match:%s %s:%s",
+                             invert_match ? " not" : "", name, string_matcher);
+    case HeaderMatcherType::SUFFIX:
+      return absl::StrFormat("Header suffix match:%s %s:%s",
+                             invert_match ? " not" : "", name, string_matcher);
+    default:
+      return "";
+  }
+}
+
+std::string XdsApi::RdsUpdate::RdsRoute::Matchers::ToString() const {
+  std::vector<std::string> contents;
+  contents.push_back(path_matcher.ToString());
+  for (const auto& header_it : header_matchers) {
+    contents.push_back(header_it.ToString());
+  }
+  if (fraction_per_million.has_value()) {
+    contents.push_back(absl::StrFormat("Fraction Per Million %d",
+                                       fraction_per_million.value()));
+  }
+  return absl::StrJoin(contents, "\n");
+}
+
+std::string XdsApi::RdsUpdate::RdsRoute::ClusterWeight::ToString() const {
+  return absl::StrFormat("{cluster=%s, weight=%d}", name, weight);
+}
+
+std::string XdsApi::RdsUpdate::RdsRoute::ToString() const {
+  std::vector<std::string> contents;
+  contents.push_back(matchers.ToString());
+  if (!cluster_name.empty()) {
+    contents.push_back(absl::StrFormat("Cluster name: %s", cluster_name));
+  }
+  for (const auto& weighted_it : weighted_clusters) {
+    contents.push_back(weighted_it.ToString());
+  }
+  return absl::StrJoin(contents, "\n");
+}
+
+std::string XdsApi::RdsUpdate::ToString() const {
+  std::vector<std::string> contents;
+  for (const auto& route_it : routes) {
+    contents.push_back(route_it.ToString());
+  }
+  return absl::StrJoin(contents, ",\n");
+}
+
+XdsApi::XdsApi(XdsClient* client, TraceFlag* tracer,
+               const XdsBootstrap::Node* node)
+    : client_(client),
+      tracer_(tracer),
+      node_(node),
       build_version_(absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING, " ",
                                   grpc_version_string())),
       user_agent_name_(absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING)) {}
@@ -147,13 +247,10 @@ void PopulateListValue(upb_arena* arena, google_protobuf_ListValue* list_value,
 void PopulateMetadata(upb_arena* arena, google_protobuf_Struct* metadata_pb,
                       const Json::Object& metadata) {
   for (const auto& p : metadata) {
-    google_protobuf_Struct_FieldsEntry* field =
-        google_protobuf_Struct_add_fields(metadata_pb, arena);
-    google_protobuf_Struct_FieldsEntry_set_key(
-        field, upb_strview_makez(p.first.c_str()));
-    google_protobuf_Value* value =
-        google_protobuf_Struct_FieldsEntry_mutable_value(field, arena);
+    google_protobuf_Value* value = google_protobuf_Value_new(arena);
     PopulateMetadataValue(arena, value, p.second);
+    google_protobuf_Struct_fields_set(
+        metadata_pb, upb_strview_makez(p.first.c_str()), value, arena);
   }
 }
 
@@ -214,14 +311,12 @@ void PopulateNode(upb_arena* arena, const XdsBootstrap::Node* node,
     if (!server_name.empty()) {
       google_protobuf_Struct* metadata =
           envoy_api_v2_core_Node_mutable_metadata(node_msg, arena);
-      google_protobuf_Struct_FieldsEntry* field =
-          google_protobuf_Struct_add_fields(metadata, arena);
-      google_protobuf_Struct_FieldsEntry_set_key(
-          field, upb_strview_makez("PROXYLESS_CLIENT_HOSTNAME"));
-      google_protobuf_Value* value =
-          google_protobuf_Struct_FieldsEntry_mutable_value(field, arena);
+      google_protobuf_Value* value = google_protobuf_Value_new(arena);
       google_protobuf_Value_set_string_value(
           value, upb_strview_make(server_name.data(), server_name.size()));
+      google_protobuf_Struct_fields_set(
+          metadata, upb_strview_makez("PROXYLESS_CLIENT_HOSTNAME"), value,
+          arena);
     }
     if (!node->locality_region.empty() || !node->locality_zone.empty() ||
         !node->locality_subzone.empty()) {
@@ -253,24 +348,206 @@ void PopulateNode(upb_arena* arena, const XdsBootstrap::Node* node,
       arena);
 }
 
-envoy_api_v2_DiscoveryRequest* CreateDiscoveryRequest(
-    upb_arena* arena, const char* type_url, const std::string& version,
-    const std::string& nonce, grpc_error* error) {
+inline absl::string_view UpbStringToAbsl(const upb_strview& str) {
+  return absl::string_view(str.data, str.size);
+}
+
+inline std::string UpbStringToStdString(const upb_strview& str) {
+  return std::string(str.data, str.size);
+}
+
+inline void AddStringField(const char* name, const upb_strview& value,
+                           std::vector<std::string>* fields,
+                           bool add_if_empty = false) {
+  if (value.size > 0 || add_if_empty) {
+    fields->emplace_back(
+        absl::StrCat(name, ": \"", UpbStringToAbsl(value), "\""));
+  }
+}
+
+inline void AddUInt32ValueField(const char* name,
+                                const google_protobuf_UInt32Value* value,
+                                std::vector<std::string>* fields) {
+  if (value != nullptr) {
+    fields->emplace_back(absl::StrCat(
+        name, " { value: ", google_protobuf_UInt32Value_value(value), " }"));
+  }
+}
+
+inline void AddLocalityField(int indent_level,
+                             const envoy_api_v2_core_Locality* locality,
+                             std::vector<std::string>* fields) {
+  std::string indent =
+      absl::StrJoin(std::vector<std::string>(indent_level, "  "), "");
+  // region
+  std::string field = absl::StrCat(indent, "region");
+  AddStringField(field.c_str(), envoy_api_v2_core_Locality_region(locality),
+                 fields);
+  // zone
+  field = absl::StrCat(indent, "zone");
+  AddStringField(field.c_str(), envoy_api_v2_core_Locality_zone(locality),
+                 fields);
+  // sub_zone
+  field = absl::StrCat(indent, "sub_zone");
+  AddStringField(field.c_str(), envoy_api_v2_core_Locality_sub_zone(locality),
+                 fields);
+}
+
+void AddNodeLogFields(const envoy_api_v2_core_Node* node,
+                      std::vector<std::string>* fields) {
+  fields->emplace_back("node {");
+  // id
+  AddStringField("  id", envoy_api_v2_core_Node_id(node), fields);
+  // metadata
+  const google_protobuf_Struct* metadata =
+      envoy_api_v2_core_Node_metadata(node);
+  if (metadata != nullptr) {
+    fields->emplace_back("  metadata {");
+    size_t entry_idx = UPB_MAP_BEGIN;
+    while (true) {
+      const google_protobuf_Struct_FieldsEntry* entry =
+          google_protobuf_Struct_fields_next(metadata, &entry_idx);
+      if (entry == nullptr) break;
+      fields->emplace_back("    field {");
+      // key
+      AddStringField("      key", google_protobuf_Struct_FieldsEntry_key(entry),
+                     fields);
+      // value
+      const google_protobuf_Value* value =
+          google_protobuf_Struct_FieldsEntry_value(entry);
+      if (value != nullptr) {
+        std::string value_str;
+        if (google_protobuf_Value_has_string_value(value)) {
+          value_str = absl::StrCat(
+              "string_value: \"",
+              UpbStringToAbsl(google_protobuf_Value_string_value(value)), "\"");
+        } else if (google_protobuf_Value_has_null_value(value)) {
+          value_str = "null_value: NULL_VALUE";
+        } else if (google_protobuf_Value_has_number_value(value)) {
+          value_str = absl::StrCat("double_value: ",
+                                   google_protobuf_Value_number_value(value));
+        } else if (google_protobuf_Value_has_bool_value(value)) {
+          value_str = absl::StrCat("bool_value: ",
+                                   google_protobuf_Value_bool_value(value));
+        } else if (google_protobuf_Value_has_struct_value(value)) {
+          value_str = "struct_value: <not printed>";
+        } else if (google_protobuf_Value_has_list_value(value)) {
+          value_str = "list_value: <not printed>";
+        } else {
+          value_str = "<unknown>";
+        }
+        fields->emplace_back(absl::StrCat("      value { ", value_str, " }"));
+      }
+      fields->emplace_back("    }");
+    }
+    fields->emplace_back("  }");
+  }
+  // locality
+  const envoy_api_v2_core_Locality* locality =
+      envoy_api_v2_core_Node_locality(node);
+  if (locality != nullptr) {
+    fields->emplace_back("  locality {");
+    AddLocalityField(2, locality, fields);
+    fields->emplace_back("  }");
+  }
+  // build_version
+  AddStringField("  build_version", envoy_api_v2_core_Node_build_version(node),
+                 fields);
+  // user_agent_name
+  AddStringField("  user_agent_name",
+                 envoy_api_v2_core_Node_user_agent_name(node), fields);
+  // user_agent_version
+  AddStringField("  user_agent_version",
+                 envoy_api_v2_core_Node_user_agent_version(node), fields);
+  // client_features
+  size_t num_client_features;
+  const upb_strview* client_features =
+      envoy_api_v2_core_Node_client_features(node, &num_client_features);
+  for (size_t i = 0; i < num_client_features; ++i) {
+    AddStringField("  client_features", client_features[i], fields);
+  }
+  fields->emplace_back("}");
+}
+
+void MaybeLogDiscoveryRequest(XdsClient* client, TraceFlag* tracer,
+                              const envoy_api_v2_DiscoveryRequest* request) {
+  if (GRPC_TRACE_FLAG_ENABLED(*tracer) &&
+      gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+    // TODO(roth): When we can upgrade upb, use upb textformat code to dump
+    // the raw proto instead of doing this manually.
+    std::vector<std::string> fields;
+    // version_info
+    AddStringField("version_info",
+                   envoy_api_v2_DiscoveryRequest_version_info(request),
+                   &fields);
+    // node
+    const envoy_api_v2_core_Node* node =
+        envoy_api_v2_DiscoveryRequest_node(request);
+    if (node != nullptr) AddNodeLogFields(node, &fields);
+    // resource_names
+    size_t num_resource_names;
+    const upb_strview* resource_names =
+        envoy_api_v2_DiscoveryRequest_resource_names(request,
+                                                     &num_resource_names);
+    for (size_t i = 0; i < num_resource_names; ++i) {
+      AddStringField("resource_names", resource_names[i], &fields);
+    }
+    // type_url
+    AddStringField("type_url", envoy_api_v2_DiscoveryRequest_type_url(request),
+                   &fields);
+    // response_nonce
+    AddStringField("response_nonce",
+                   envoy_api_v2_DiscoveryRequest_response_nonce(request),
+                   &fields);
+    // error_detail
+    const struct google_rpc_Status* error_detail =
+        envoy_api_v2_DiscoveryRequest_error_detail(request);
+    if (error_detail != nullptr) {
+      fields.emplace_back("error_detail {");
+      // code
+      int32_t code = google_rpc_Status_code(error_detail);
+      if (code != 0) fields.emplace_back(absl::StrCat("  code: ", code));
+      // message
+      AddStringField("  message", google_rpc_Status_message(error_detail),
+                     &fields);
+      fields.emplace_back("}");
+    }
+    gpr_log(GPR_DEBUG, "[xds_client %p] constructed ADS request: %s", client,
+            absl::StrJoin(fields, "\n").c_str());
+  }
+}
+
+grpc_slice SerializeDiscoveryRequest(upb_arena* arena,
+                                     envoy_api_v2_DiscoveryRequest* request) {
+  size_t output_length;
+  char* output =
+      envoy_api_v2_DiscoveryRequest_serialize(request, arena, &output_length);
+  return grpc_slice_from_copied_buffer(output, output_length);
+}
+
+}  // namespace
+
+grpc_slice XdsApi::CreateAdsRequest(
+    const std::string& type_url,
+    const std::set<absl::string_view>& resource_names,
+    const std::string& version, const std::string& nonce, grpc_error* error,
+    bool populate_node) {
+  upb::Arena arena;
   // Create a request.
   envoy_api_v2_DiscoveryRequest* request =
-      envoy_api_v2_DiscoveryRequest_new(arena);
+      envoy_api_v2_DiscoveryRequest_new(arena.ptr());
   // Set type_url.
-  envoy_api_v2_DiscoveryRequest_set_type_url(request,
-                                             upb_strview_makez(type_url));
+  envoy_api_v2_DiscoveryRequest_set_type_url(
+      request, upb_strview_make(type_url.data(), type_url.size()));
   // Set version_info.
   if (!version.empty()) {
     envoy_api_v2_DiscoveryRequest_set_version_info(
-        request, upb_strview_makez(version.c_str()));
+        request, upb_strview_make(version.data(), version.size()));
   }
   // Set nonce.
   if (!nonce.empty()) {
     envoy_api_v2_DiscoveryRequest_set_response_nonce(
-        request, upb_strview_makez(nonce.c_str()));
+        request, upb_strview_make(nonce.data(), nonce.size()));
   }
   // Set error_detail if it's a NACK.
   if (error != GRPC_ERROR_NONE) {
@@ -282,39 +559,11 @@ envoy_api_v2_DiscoveryRequest* CreateDiscoveryRequest(
                              GPR_SLICE_START_PTR(error_description_slice)),
                          GPR_SLICE_LENGTH(error_description_slice));
     google_rpc_Status* error_detail =
-        envoy_api_v2_DiscoveryRequest_mutable_error_detail(request, arena);
+        envoy_api_v2_DiscoveryRequest_mutable_error_detail(request,
+                                                           arena.ptr());
     google_rpc_Status_set_message(error_detail, error_description_strview);
     GRPC_ERROR_UNREF(error);
   }
-  return request;
-}
-
-grpc_slice SerializeDiscoveryRequest(upb_arena* arena,
-                                     envoy_api_v2_DiscoveryRequest* request) {
-  size_t output_length;
-  char* output =
-      envoy_api_v2_DiscoveryRequest_serialize(request, arena, &output_length);
-  return grpc_slice_from_copied_buffer(output, output_length);
-}
-
-}  // namespace
-
-grpc_slice XdsApi::CreateUnsupportedTypeNackRequest(const std::string& type_url,
-                                                    const std::string& nonce,
-                                                    grpc_error* error) {
-  upb::Arena arena;
-  envoy_api_v2_DiscoveryRequest* request = CreateDiscoveryRequest(
-      arena.ptr(), type_url.c_str(), /*version=*/"", nonce, error);
-  return SerializeDiscoveryRequest(arena.ptr(), request);
-}
-
-grpc_slice XdsApi::CreateLdsRequest(const std::string& server_name,
-                                    const std::string& version,
-                                    const std::string& nonce, grpc_error* error,
-                                    bool populate_node) {
-  upb::Arena arena;
-  envoy_api_v2_DiscoveryRequest* request =
-      CreateDiscoveryRequest(arena.ptr(), kLdsTypeUrl, version, nonce, error);
   // Populate node.
   if (populate_node) {
     envoy_api_v2_core_Node* node_msg =
@@ -322,82 +571,376 @@ grpc_slice XdsApi::CreateLdsRequest(const std::string& server_name,
     PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_, "",
                  node_msg);
   }
-  // Add resource_name.
-  envoy_api_v2_DiscoveryRequest_add_resource_names(
-      request, upb_strview_make(server_name.data(), server_name.size()),
-      arena.ptr());
+  // Add resource_names.
+  for (const auto& resource_name : resource_names) {
+    envoy_api_v2_DiscoveryRequest_add_resource_names(
+        request, upb_strview_make(resource_name.data(), resource_name.size()),
+        arena.ptr());
+  }
+  MaybeLogDiscoveryRequest(client_, tracer_, request);
   return SerializeDiscoveryRequest(arena.ptr(), request);
 }
 
-grpc_slice XdsApi::CreateRdsRequest(const std::string& route_config_name,
-                                    const std::string& version,
-                                    const std::string& nonce, grpc_error* error,
-                                    bool populate_node) {
-  upb::Arena arena;
-  envoy_api_v2_DiscoveryRequest* request =
-      CreateDiscoveryRequest(arena.ptr(), kRdsTypeUrl, version, nonce, error);
-  // Populate node.
-  if (populate_node) {
-    envoy_api_v2_core_Node* node_msg =
-        envoy_api_v2_DiscoveryRequest_mutable_node(request, arena.ptr());
-    PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_, "",
-                 node_msg);
+namespace {
+
+void MaybeLogDiscoveryResponse(XdsClient* client, TraceFlag* tracer,
+                               const envoy_api_v2_DiscoveryResponse* response) {
+  if (GRPC_TRACE_FLAG_ENABLED(*tracer) &&
+      gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+    // TODO(roth): When we can upgrade upb, use upb textformat code to dump
+    // the raw proto instead of doing this manually.
+    std::vector<std::string> fields;
+    // version_info
+    AddStringField("version_info",
+                   envoy_api_v2_DiscoveryResponse_version_info(response),
+                   &fields);
+    // resources
+    size_t num_resources;
+    envoy_api_v2_DiscoveryResponse_resources(response, &num_resources);
+    fields.emplace_back(
+        absl::StrCat("resources: <", num_resources, " element(s)>"));
+    // type_url
+    AddStringField("type_url",
+                   envoy_api_v2_DiscoveryResponse_type_url(response), &fields);
+    // nonce
+    AddStringField("nonce", envoy_api_v2_DiscoveryResponse_nonce(response),
+                   &fields);
+    gpr_log(GPR_DEBUG, "[xds_client %p] received response: %s", client,
+            absl::StrJoin(fields, "\n").c_str());
   }
-  // Add resource_name.
-  envoy_api_v2_DiscoveryRequest_add_resource_names(
-      request,
-      upb_strview_make(route_config_name.data(), route_config_name.size()),
-      arena.ptr());
-  return SerializeDiscoveryRequest(arena.ptr(), request);
 }
 
-grpc_slice XdsApi::CreateCdsRequest(const std::set<StringView>& cluster_names,
-                                    const std::string& version,
-                                    const std::string& nonce, grpc_error* error,
-                                    bool populate_node) {
-  upb::Arena arena;
-  envoy_api_v2_DiscoveryRequest* request =
-      CreateDiscoveryRequest(arena.ptr(), kCdsTypeUrl, version, nonce, error);
-  // Populate node.
-  if (populate_node) {
-    envoy_api_v2_core_Node* node_msg =
-        envoy_api_v2_DiscoveryRequest_mutable_node(request, arena.ptr());
-    PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_, "",
-                 node_msg);
-  }
-  // Add resource_names.
-  for (const auto& cluster_name : cluster_names) {
-    envoy_api_v2_DiscoveryRequest_add_resource_names(
-        request, upb_strview_make(cluster_name.data(), cluster_name.size()),
-        arena.ptr());
+void MaybeLogRouteConfiguration(
+    XdsClient* client, TraceFlag* tracer,
+    const envoy_api_v2_RouteConfiguration* route_config) {
+  if (GRPC_TRACE_FLAG_ENABLED(*tracer) &&
+      gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+    // TODO(roth): When we can upgrade upb, use upb textformat code to dump
+    // the raw proto instead of doing this manually.
+    std::vector<std::string> fields;
+    // name
+    AddStringField("name", envoy_api_v2_RouteConfiguration_name(route_config),
+                   &fields);
+    // virtual_hosts
+    size_t num_virtual_hosts;
+    const envoy_api_v2_route_VirtualHost* const* virtual_hosts =
+        envoy_api_v2_RouteConfiguration_virtual_hosts(route_config,
+                                                      &num_virtual_hosts);
+    for (size_t i = 0; i < num_virtual_hosts; ++i) {
+      const auto* virtual_host = virtual_hosts[i];
+      fields.push_back("virtual_hosts {");
+      // name
+      AddStringField(
+          "  name", envoy_api_v2_route_VirtualHost_name(virtual_host), &fields);
+      // domains
+      size_t num_domains;
+      const upb_strview* const domains =
+          envoy_api_v2_route_VirtualHost_domains(virtual_host, &num_domains);
+      for (size_t j = 0; j < num_domains; ++j) {
+        AddStringField("  domains", domains[j], &fields);
+      }
+      // routes
+      size_t num_routes;
+      const envoy_api_v2_route_Route* const* routes =
+          envoy_api_v2_route_VirtualHost_routes(virtual_host, &num_routes);
+      for (size_t j = 0; j < num_routes; ++j) {
+        const auto* route = routes[j];
+        fields.push_back("  route {");
+        // name
+        AddStringField("    name", envoy_api_v2_route_Route_name(route),
+                       &fields);
+        // match
+        const envoy_api_v2_route_RouteMatch* match =
+            envoy_api_v2_route_Route_match(route);
+        if (match != nullptr) {
+          fields.emplace_back("    match {");
+          // path matching
+          if (envoy_api_v2_route_RouteMatch_has_prefix(match)) {
+            AddStringField("      prefix",
+                           envoy_api_v2_route_RouteMatch_prefix(match), &fields,
+                           /*add_if_empty=*/true);
+          } else if (envoy_api_v2_route_RouteMatch_has_path(match)) {
+            AddStringField("      path",
+                           envoy_api_v2_route_RouteMatch_path(match), &fields,
+                           /*add_if_empty=*/true);
+          } else if (envoy_api_v2_route_RouteMatch_has_regex(match)) {
+            AddStringField("      regex",
+                           envoy_api_v2_route_RouteMatch_regex(match), &fields,
+                           /*add_if_empty=*/true);
+          } else if (envoy_api_v2_route_RouteMatch_has_safe_regex(match)) {
+            fields.emplace_back("      safe_regex: <not printed>");
+          } else {
+            fields.emplace_back("      <unknown path matching type>");
+          }
+          // header matching
+          size_t num_headers;
+          envoy_api_v2_route_RouteMatch_headers(match, &num_headers);
+          if (num_headers > 0) {
+            fields.emplace_back(
+                absl::StrCat("      headers: <", num_headers, " element(s)>"));
+          }
+          fields.emplace_back("    }");
+        }
+        // action
+        if (envoy_api_v2_route_Route_has_route(route)) {
+          const envoy_api_v2_route_RouteAction* action =
+              envoy_api_v2_route_Route_route(route);
+          fields.emplace_back("    route {");
+          if (envoy_api_v2_route_RouteAction_has_cluster(action)) {
+            AddStringField("      cluster",
+                           envoy_api_v2_route_RouteAction_cluster(action),
+                           &fields);
+          } else if (envoy_api_v2_route_RouteAction_has_cluster_header(
+                         action)) {
+            AddStringField(
+                "      cluster_header",
+                envoy_api_v2_route_RouteAction_cluster_header(action), &fields);
+          } else if (envoy_api_v2_route_RouteAction_has_weighted_clusters(
+                         action)) {
+            const envoy_api_v2_route_WeightedCluster* weighted_clusters =
+                envoy_api_v2_route_RouteAction_weighted_clusters(action);
+            fields.emplace_back("      weighted_clusters {");
+            size_t num_cluster_weights;
+            const envoy_api_v2_route_WeightedCluster_ClusterWeight* const*
+                cluster_weights = envoy_api_v2_route_WeightedCluster_clusters(
+                    weighted_clusters, &num_cluster_weights);
+            for (size_t i = 0; i < num_cluster_weights; ++i) {
+              const envoy_api_v2_route_WeightedCluster_ClusterWeight*
+                  cluster_weight = cluster_weights[i];
+              fields.emplace_back("        clusters {");
+              AddStringField(
+                  "          name",
+                  envoy_api_v2_route_WeightedCluster_ClusterWeight_name(
+                      cluster_weight),
+                  &fields);
+              AddUInt32ValueField(
+                  "          weight",
+                  envoy_api_v2_route_WeightedCluster_ClusterWeight_weight(
+                      cluster_weight),
+                  &fields);
+              fields.emplace_back("        }");
+            }
+            AddUInt32ValueField("        total_weight",
+                                envoy_api_v2_route_WeightedCluster_total_weight(
+                                    weighted_clusters),
+                                &fields);
+            fields.emplace_back("      }");
+          }
+          fields.emplace_back("    }");
+        } else if (envoy_api_v2_route_Route_has_redirect(route)) {
+          fields.emplace_back("    redirect: <not printed>");
+        } else if (envoy_api_v2_route_Route_has_direct_response(route)) {
+          fields.emplace_back("    direct_response: <not printed>");
+        } else if (envoy_api_v2_route_Route_has_filter_action(route)) {
+          fields.emplace_back("    filter_action: <not printed>");
+        }
+        fields.push_back("  }");
+      }
+      fields.push_back("}");
+    }
+    gpr_log(GPR_DEBUG, "[xds_client %p] RouteConfiguration: %s", client,
+            absl::StrJoin(fields, "\n").c_str());
   }
-  return SerializeDiscoveryRequest(arena.ptr(), request);
 }
 
-grpc_slice XdsApi::CreateEdsRequest(
-    const std::set<StringView>& eds_service_names, const std::string& version,
-    const std::string& nonce, grpc_error* error, bool populate_node) {
-  upb::Arena arena;
-  envoy_api_v2_DiscoveryRequest* request =
-      CreateDiscoveryRequest(arena.ptr(), kEdsTypeUrl, version, nonce, error);
-  // Populate node.
-  if (populate_node) {
-    envoy_api_v2_core_Node* node_msg =
-        envoy_api_v2_DiscoveryRequest_mutable_node(request, arena.ptr());
-    PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_, "",
-                 node_msg);
-  }
-  // Add resource_names.
-  for (const auto& eds_service_name : eds_service_names) {
-    envoy_api_v2_DiscoveryRequest_add_resource_names(
-        request,
-        upb_strview_make(eds_service_name.data(), eds_service_name.size()),
-        arena.ptr());
+void MaybeLogCluster(XdsClient* client, TraceFlag* tracer,
+                     const envoy_api_v2_Cluster* cluster) {
+  if (GRPC_TRACE_FLAG_ENABLED(*tracer) &&
+      gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+    // TODO(roth): When we can upgrade upb, use upb textformat code to dump
+    // the raw proto instead of doing this manually.
+    std::vector<std::string> fields;
+    // name
+    AddStringField("name", envoy_api_v2_Cluster_name(cluster), &fields);
+    // type
+    if (envoy_api_v2_Cluster_has_type(cluster)) {
+      fields.emplace_back(
+          absl::StrCat("type: ", envoy_api_v2_Cluster_type(cluster)));
+    } else if (envoy_api_v2_Cluster_has_cluster_type(cluster)) {
+      fields.emplace_back("cluster_type: <not printed>");
+    } else {
+      fields.emplace_back("<unknown type>");
+    }
+    // eds_cluster_config
+    const envoy_api_v2_Cluster_EdsClusterConfig* eds_cluster_config =
+        envoy_api_v2_Cluster_eds_cluster_config(cluster);
+    if (eds_cluster_config != nullptr) {
+      fields.emplace_back("eds_cluster_config {");
+      // eds_config
+      const struct envoy_api_v2_core_ConfigSource* eds_config =
+          envoy_api_v2_Cluster_EdsClusterConfig_eds_config(eds_cluster_config);
+      if (eds_config != nullptr) {
+        if (envoy_api_v2_core_ConfigSource_has_ads(eds_config)) {
+          fields.emplace_back("  eds_config { ads {} }");
+        } else {
+          fields.emplace_back("  eds_config: <non-ADS type>");
+        }
+      }
+      // service_name
+      AddStringField("  service_name",
+                     envoy_api_v2_Cluster_EdsClusterConfig_service_name(
+                         eds_cluster_config),
+                     &fields);
+      fields.emplace_back("}");
+    }
+    // lb_policy
+    fields.emplace_back(
+        absl::StrCat("lb_policy: ", envoy_api_v2_Cluster_lb_policy(cluster)));
+    // lrs_server
+    const envoy_api_v2_core_ConfigSource* lrs_server =
+        envoy_api_v2_Cluster_lrs_server(cluster);
+    if (lrs_server != nullptr) {
+      if (envoy_api_v2_core_ConfigSource_has_self(lrs_server)) {
+        fields.emplace_back("lrs_server { self {} }");
+      } else {
+        fields.emplace_back("lrs_server: <non-self type>");
+      }
+    }
+    gpr_log(GPR_DEBUG, "[xds_client %p] Cluster: %s", client,
+            absl::StrJoin(fields, "\n").c_str());
   }
-  return SerializeDiscoveryRequest(arena.ptr(), request);
 }
 
-namespace {
+void MaybeLogClusterLoadAssignment(
+    XdsClient* client, TraceFlag* tracer,
+    const envoy_api_v2_ClusterLoadAssignment* cla) {
+  if (GRPC_TRACE_FLAG_ENABLED(*tracer) &&
+      gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+    // TODO(roth): When we can upgrade upb, use upb textformat code to dump
+    // the raw proto instead of doing this manually.
+    std::vector<std::string> fields;
+    // cluster_name
+    AddStringField("cluster_name",
+                   envoy_api_v2_ClusterLoadAssignment_cluster_name(cla),
+                   &fields);
+    // endpoints
+    size_t num_localities;
+    const struct envoy_api_v2_endpoint_LocalityLbEndpoints* const*
+        locality_endpoints =
+            envoy_api_v2_ClusterLoadAssignment_endpoints(cla, &num_localities);
+    for (size_t i = 0; i < num_localities; ++i) {
+      const auto* locality_endpoint = locality_endpoints[i];
+      fields.emplace_back("endpoints {");
+      // locality
+      const auto* locality =
+          envoy_api_v2_endpoint_LocalityLbEndpoints_locality(locality_endpoint);
+      if (locality != nullptr) {
+        fields.emplace_back("  locality {");
+        AddLocalityField(2, locality, &fields);
+        fields.emplace_back("  }");
+      }
+      // lb_endpoints
+      size_t num_lb_endpoints;
+      const envoy_api_v2_endpoint_LbEndpoint* const* lb_endpoints =
+          envoy_api_v2_endpoint_LocalityLbEndpoints_lb_endpoints(
+              locality_endpoint, &num_lb_endpoints);
+      for (size_t j = 0; j < num_lb_endpoints; ++j) {
+        const auto* lb_endpoint = lb_endpoints[j];
+        fields.emplace_back("  lb_endpoints {");
+        // health_status
+        uint32_t health_status =
+            envoy_api_v2_endpoint_LbEndpoint_health_status(lb_endpoint);
+        if (health_status > 0) {
+          fields.emplace_back(
+              absl::StrCat("    health_status: ", health_status));
+        }
+        // endpoint
+        const envoy_api_v2_endpoint_Endpoint* endpoint =
+            envoy_api_v2_endpoint_LbEndpoint_endpoint(lb_endpoint);
+        if (endpoint != nullptr) {
+          fields.emplace_back("    endpoint {");
+          // address
+          const auto* address =
+              envoy_api_v2_endpoint_Endpoint_address(endpoint);
+          if (address != nullptr) {
+            fields.emplace_back("      address {");
+            // socket_address
+            const auto* socket_address =
+                envoy_api_v2_core_Address_socket_address(address);
+            if (socket_address != nullptr) {
+              fields.emplace_back("        socket_address {");
+              // address
+              AddStringField(
+                  "          address",
+                  envoy_api_v2_core_SocketAddress_address(socket_address),
+                  &fields);
+              // port_value
+              if (envoy_api_v2_core_SocketAddress_has_port_value(
+                      socket_address)) {
+                fields.emplace_back(
+                    absl::StrCat("          port_value: ",
+                                 envoy_api_v2_core_SocketAddress_port_value(
+                                     socket_address)));
+              } else {
+                fields.emplace_back("        <non-numeric port>");
+              }
+              fields.emplace_back("        }");
+            } else {
+              fields.emplace_back("        <non-socket address>");
+            }
+            fields.emplace_back("      }");
+          }
+          fields.emplace_back("    }");
+        }
+        fields.emplace_back("  }");
+      }
+      // load_balancing_weight
+      AddUInt32ValueField(
+          "  load_balancing_weight",
+          envoy_api_v2_endpoint_LocalityLbEndpoints_load_balancing_weight(
+              locality_endpoint),
+          &fields);
+      // priority
+      uint32_t priority =
+          envoy_api_v2_endpoint_LocalityLbEndpoints_priority(locality_endpoint);
+      if (priority > 0) {
+        fields.emplace_back(absl::StrCat("  priority: ", priority));
+      }
+      fields.emplace_back("}");
+    }
+    // policy
+    const envoy_api_v2_ClusterLoadAssignment_Policy* policy =
+        envoy_api_v2_ClusterLoadAssignment_policy(cla);
+    if (policy != nullptr) {
+      fields.emplace_back("policy {");
+      // drop_overloads
+      size_t num_drop_overloads;
+      const envoy_api_v2_ClusterLoadAssignment_Policy_DropOverload* const*
+          drop_overloads =
+              envoy_api_v2_ClusterLoadAssignment_Policy_drop_overloads(
+                  policy, &num_drop_overloads);
+      for (size_t i = 0; i < num_drop_overloads; ++i) {
+        auto* drop_overload = drop_overloads[i];
+        fields.emplace_back("  drop_overloads {");
+        // category
+        AddStringField(
+            "    category",
+            envoy_api_v2_ClusterLoadAssignment_Policy_DropOverload_category(
+                drop_overload),
+            &fields);
+        // drop_percentage
+        const auto* drop_percentage =
+            envoy_api_v2_ClusterLoadAssignment_Policy_DropOverload_drop_percentage(
+                drop_overload);
+        if (drop_percentage != nullptr) {
+          fields.emplace_back("    drop_percentage {");
+          fields.emplace_back(absl::StrCat(
+              "      numerator: ",
+              envoy_type_FractionalPercent_numerator(drop_percentage)));
+          fields.emplace_back(absl::StrCat(
+              "      denominator: ",
+              envoy_type_FractionalPercent_denominator(drop_percentage)));
+          fields.emplace_back("    }");
+        }
+        fields.emplace_back("  }");
+      }
+      // overprovisioning_factor
+      fields.emplace_back("}");
+    }
+    gpr_log(GPR_DEBUG, "[xds_client %p] ClusterLoadAssignment: %s", client,
+            absl::StrJoin(fields, "\n").c_str());
+  }
+}
 
 // Better match type has smaller value.
 enum MatchType {
@@ -423,16 +966,18 @@ bool DomainMatch(MatchType match_type, std::string domain_pattern,
   } else if (match_type == SUFFIX_MATCH) {
     // Asterisk must match at least one char.
     if (expected_host_name.size() < domain_pattern.size()) return false;
-    StringView pattern_suffix(domain_pattern.c_str() + 1);
-    StringView host_suffix(expected_host_name.c_str() +
-                           expected_host_name.size() - pattern_suffix.size());
+    absl::string_view pattern_suffix(domain_pattern.c_str() + 1);
+    absl::string_view host_suffix(expected_host_name.c_str() +
+                                  expected_host_name.size() -
+                                  pattern_suffix.size());
     return pattern_suffix == host_suffix;
   } else if (match_type == PREFIX_MATCH) {
     // Asterisk must match at least one char.
     if (expected_host_name.size() < domain_pattern.size()) return false;
-    StringView pattern_prefix(domain_pattern.c_str(),
-                              domain_pattern.size() - 1);
-    StringView host_prefix(expected_host_name.c_str(), pattern_prefix.size());
+    absl::string_view pattern_prefix(domain_pattern.c_str(),
+                                     domain_pattern.size() - 1);
+    absl::string_view host_prefix(expected_host_name.c_str(),
+                                  pattern_prefix.size());
     return pattern_prefix == host_prefix;
   } else {
     return match_type == UNIVERSE_MATCH;
@@ -448,12 +993,272 @@ MatchType DomainPatternMatchType(const std::string& domain_pattern) {
   return INVALID_MATCH;
 }
 
+grpc_error* RoutePathMatchParse(const envoy_api_v2_route_RouteMatch* match,
+                                XdsApi::RdsUpdate::RdsRoute* rds_route,
+                                bool* ignore_route) {
+  if (envoy_api_v2_route_RouteMatch_has_prefix(match)) {
+    upb_strview prefix = envoy_api_v2_route_RouteMatch_prefix(match);
+    // Empty prefix "" is accepted.
+    if (prefix.size > 0) {
+      // Prefix "/" is accepted.
+      if (prefix.data[0] != '/') {
+        // Prefix which does not start with a / will never match anything, so
+        // ignore this route.
+        *ignore_route = true;
+        return GRPC_ERROR_NONE;
+      }
+      std::vector<absl::string_view> prefix_elements =
+          absl::StrSplit(absl::string_view(prefix.data, prefix.size).substr(1),
+                         absl::MaxSplits('/', 2));
+      if (prefix_elements.size() > 2) {
+        // Prefix cannot have more than 2 slashes.
+        *ignore_route = true;
+        return GRPC_ERROR_NONE;
+      } else if (prefix_elements.size() == 2 && prefix_elements[0].empty()) {
+        // Prefix contains empty string between the 2 slashes
+        *ignore_route = true;
+        return GRPC_ERROR_NONE;
+      }
+    }
+    rds_route->matchers.path_matcher.type = XdsApi::RdsUpdate::RdsRoute::
+        Matchers::PathMatcher::PathMatcherType::PREFIX;
+    rds_route->matchers.path_matcher.string_matcher =
+        UpbStringToStdString(prefix);
+  } else if (envoy_api_v2_route_RouteMatch_has_path(match)) {
+    upb_strview path = envoy_api_v2_route_RouteMatch_path(match);
+    if (path.size == 0) {
+      // Path that is empty will never match anything, so ignore this route.
+      *ignore_route = true;
+      return GRPC_ERROR_NONE;
+    }
+    if (path.data[0] != '/') {
+      // Path which does not start with a / will never match anything, so
+      // ignore this route.
+      *ignore_route = true;
+      return GRPC_ERROR_NONE;
+    }
+    std::vector<absl::string_view> path_elements =
+        absl::StrSplit(absl::string_view(path.data, path.size).substr(1),
+                       absl::MaxSplits('/', 2));
+    if (path_elements.size() != 2) {
+      // Path not in the required format of /service/method will never match
+      // anything, so ignore this route.
+      *ignore_route = true;
+      return GRPC_ERROR_NONE;
+    } else if (path_elements[0].empty()) {
+      // Path contains empty service name will never match anything, so ignore
+      // this route.
+      *ignore_route = true;
+      return GRPC_ERROR_NONE;
+    } else if (path_elements[1].empty()) {
+      // Path contains empty method name will never match anything, so ignore
+      // this route.
+      *ignore_route = true;
+      return GRPC_ERROR_NONE;
+    }
+    rds_route->matchers.path_matcher.type = XdsApi::RdsUpdate::RdsRoute::
+        Matchers::PathMatcher::PathMatcherType::PATH;
+    rds_route->matchers.path_matcher.string_matcher =
+        UpbStringToStdString(path);
+  } else if (envoy_api_v2_route_RouteMatch_has_safe_regex(match)) {
+    const envoy_type_matcher_RegexMatcher* regex_matcher =
+        envoy_api_v2_route_RouteMatch_safe_regex(match);
+    GPR_ASSERT(regex_matcher != nullptr);
+    const std::string matcher = UpbStringToStdString(
+        envoy_type_matcher_RegexMatcher_regex(regex_matcher));
+    std::unique_ptr<RE2> regex = absl::make_unique<RE2>(matcher);
+    if (!regex->ok()) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "Invalid regex string specified in path matcher.");
+    }
+    rds_route->matchers.path_matcher.type = XdsApi::RdsUpdate::RdsRoute::
+        Matchers::PathMatcher::PathMatcherType::REGEX;
+    rds_route->matchers.path_matcher.regex_matcher = std::move(regex);
+  } else {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+        "Invalid route path specifier specified.");
+  }
+  return GRPC_ERROR_NONE;
+}
+
+grpc_error* RouteHeaderMatchersParse(const envoy_api_v2_route_RouteMatch* match,
+                                     XdsApi::RdsUpdate::RdsRoute* rds_route) {
+  size_t size;
+  const envoy_api_v2_route_HeaderMatcher* const* headers =
+      envoy_api_v2_route_RouteMatch_headers(match, &size);
+  for (size_t i = 0; i < size; ++i) {
+    const envoy_api_v2_route_HeaderMatcher* header = headers[i];
+    XdsApi::RdsUpdate::RdsRoute::Matchers::HeaderMatcher header_matcher;
+    header_matcher.name =
+        UpbStringToStdString(envoy_api_v2_route_HeaderMatcher_name(header));
+    if (envoy_api_v2_route_HeaderMatcher_has_exact_match(header)) {
+      header_matcher.type = XdsApi::RdsUpdate::RdsRoute::Matchers::
+          HeaderMatcher::HeaderMatcherType::EXACT;
+      header_matcher.string_matcher = UpbStringToStdString(
+          envoy_api_v2_route_HeaderMatcher_exact_match(header));
+    } else if (envoy_api_v2_route_HeaderMatcher_has_safe_regex_match(header)) {
+      const envoy_type_matcher_RegexMatcher* regex_matcher =
+          envoy_api_v2_route_HeaderMatcher_safe_regex_match(header);
+      GPR_ASSERT(regex_matcher != nullptr);
+      const std::string matcher = UpbStringToStdString(
+          envoy_type_matcher_RegexMatcher_regex(regex_matcher));
+      std::unique_ptr<RE2> regex = absl::make_unique<RE2>(matcher);
+      if (!regex->ok()) {
+        return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+            "Invalid regex string specified in header matcher.");
+      }
+      header_matcher.type = XdsApi::RdsUpdate::RdsRoute::Matchers::
+          HeaderMatcher::HeaderMatcherType::REGEX;
+      header_matcher.regex_match = std::move(regex);
+    } else if (envoy_api_v2_route_HeaderMatcher_has_range_match(header)) {
+      header_matcher.type = XdsApi::RdsUpdate::RdsRoute::Matchers::
+          HeaderMatcher::HeaderMatcherType::RANGE;
+      const envoy_type_Int64Range* range_matcher =
+          envoy_api_v2_route_HeaderMatcher_range_match(header);
+      header_matcher.range_start = envoy_type_Int64Range_start(range_matcher);
+      header_matcher.range_end = envoy_type_Int64Range_end(range_matcher);
+      if (header_matcher.range_end < header_matcher.range_start) {
+        return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+            "Invalid range header matcher specifier specified: end "
+            "cannot be smaller than start.");
+      }
+    } else if (envoy_api_v2_route_HeaderMatcher_has_present_match(header)) {
+      header_matcher.type = XdsApi::RdsUpdate::RdsRoute::Matchers::
+          HeaderMatcher::HeaderMatcherType::PRESENT;
+      header_matcher.present_match =
+          envoy_api_v2_route_HeaderMatcher_present_match(header);
+    } else if (envoy_api_v2_route_HeaderMatcher_has_prefix_match(header)) {
+      header_matcher.type = XdsApi::RdsUpdate::RdsRoute::Matchers::
+          HeaderMatcher::HeaderMatcherType::PREFIX;
+      header_matcher.string_matcher = UpbStringToStdString(
+          envoy_api_v2_route_HeaderMatcher_prefix_match(header));
+    } else if (envoy_api_v2_route_HeaderMatcher_has_suffix_match(header)) {
+      header_matcher.type = XdsApi::RdsUpdate::RdsRoute::Matchers::
+          HeaderMatcher::HeaderMatcherType::SUFFIX;
+      header_matcher.string_matcher = UpbStringToStdString(
+          envoy_api_v2_route_HeaderMatcher_suffix_match(header));
+    } else {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "Invalid route header matcher specified.");
+    }
+    header_matcher.invert_match =
+        envoy_api_v2_route_HeaderMatcher_invert_match(header);
+    rds_route->matchers.header_matchers.emplace_back(std::move(header_matcher));
+  }
+  return GRPC_ERROR_NONE;
+}
+
+grpc_error* RouteRuntimeFractionParse(
+    const envoy_api_v2_route_RouteMatch* match,
+    XdsApi::RdsUpdate::RdsRoute* rds_route) {
+  const envoy_api_v2_core_RuntimeFractionalPercent* runtime_fraction =
+      envoy_api_v2_route_RouteMatch_runtime_fraction(match);
+  if (runtime_fraction != nullptr) {
+    const envoy_type_FractionalPercent* fraction =
+        envoy_api_v2_core_RuntimeFractionalPercent_default_value(
+            runtime_fraction);
+    if (fraction != nullptr) {
+      uint32_t numerator = envoy_type_FractionalPercent_numerator(fraction);
+      const auto denominator =
+          static_cast<envoy_type_FractionalPercent_DenominatorType>(
+              envoy_type_FractionalPercent_denominator(fraction));
+      // Normalize to million.
+      switch (denominator) {
+        case envoy_type_FractionalPercent_HUNDRED:
+          numerator *= 10000;
+          break;
+        case envoy_type_FractionalPercent_TEN_THOUSAND:
+          numerator *= 100;
+          break;
+        case envoy_type_FractionalPercent_MILLION:
+          break;
+        default:
+          return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+              "Unknown denominator type");
+      }
+      rds_route->matchers.fraction_per_million = numerator;
+    }
+  }
+  return GRPC_ERROR_NONE;
+}
+
+grpc_error* RouteActionParse(const envoy_api_v2_route_Route* route,
+                             XdsApi::RdsUpdate::RdsRoute* rds_route,
+                             bool* ignore_route) {
+  if (!envoy_api_v2_route_Route_has_route(route)) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+        "No RouteAction found in route.");
+  }
+  const envoy_api_v2_route_RouteAction* route_action =
+      envoy_api_v2_route_Route_route(route);
+  // Get the cluster or weighted_clusters in the RouteAction.
+  if (envoy_api_v2_route_RouteAction_has_cluster(route_action)) {
+    const upb_strview cluster_name =
+        envoy_api_v2_route_RouteAction_cluster(route_action);
+    if (cluster_name.size == 0) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "RouteAction cluster contains empty cluster name.");
+    }
+    rds_route->cluster_name = UpbStringToStdString(cluster_name);
+  } else if (envoy_api_v2_route_RouteAction_has_weighted_clusters(
+                 route_action)) {
+    const envoy_api_v2_route_WeightedCluster* weighted_cluster =
+        envoy_api_v2_route_RouteAction_weighted_clusters(route_action);
+    uint32_t total_weight = 100;
+    const google_protobuf_UInt32Value* weight =
+        envoy_api_v2_route_WeightedCluster_total_weight(weighted_cluster);
+    if (weight != nullptr) {
+      total_weight = google_protobuf_UInt32Value_value(weight);
+    }
+    size_t clusters_size;
+    const envoy_api_v2_route_WeightedCluster_ClusterWeight* const* clusters =
+        envoy_api_v2_route_WeightedCluster_clusters(weighted_cluster,
+                                                    &clusters_size);
+    uint32_t sum_of_weights = 0;
+    for (size_t j = 0; j < clusters_size; ++j) {
+      const envoy_api_v2_route_WeightedCluster_ClusterWeight* cluster_weight =
+          clusters[j];
+      XdsApi::RdsUpdate::RdsRoute::ClusterWeight cluster;
+      cluster.name = UpbStringToStdString(
+          envoy_api_v2_route_WeightedCluster_ClusterWeight_name(
+              cluster_weight));
+      if (cluster.name.empty()) {
+        return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+            "RouteAction weighted_cluster cluster contains empty cluster "
+            "name.");
+      }
+      const google_protobuf_UInt32Value* weight =
+          envoy_api_v2_route_WeightedCluster_ClusterWeight_weight(
+              cluster_weight);
+      if (weight == nullptr) {
+        return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+            "RouteAction weighted_cluster cluster missing weight");
+      }
+      cluster.weight = google_protobuf_UInt32Value_value(weight);
+      sum_of_weights += cluster.weight;
+      rds_route->weighted_clusters.emplace_back(std::move(cluster));
+    }
+    if (total_weight != sum_of_weights) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "RouteAction weighted_cluster has incorrect total weight");
+    }
+    if (rds_route->weighted_clusters.empty()) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "RouteAction weighted_cluster has no valid clusters specified.");
+    }
+  } else {
+    // No cluster or weighted_clusters found in RouteAction, ignore this route.
+    *ignore_route = true;
+    return GRPC_ERROR_NONE;
+  }
+  return GRPC_ERROR_NONE;
+}
+
 grpc_error* RouteConfigParse(
+    XdsClient* client, TraceFlag* tracer,
     const envoy_api_v2_RouteConfiguration* route_config,
     const std::string& expected_server_name, XdsApi::RdsUpdate* rds_update) {
-  // Strip off port from server name, if any.
-  size_t pos = expected_server_name.find(':');
-  std::string expected_host_name = expected_server_name.substr(0, pos);
+  MaybeLogRouteConfiguration(client, tracer, route_config);
   // Get the virtual hosts.
   size_t size;
   const envoy_api_v2_route_VirtualHost* const* virtual_hosts =
@@ -490,7 +1295,7 @@ grpc_error* RouteConfigParse(
         continue;
       }
       // Skip if match fails.
-      if (!DomainMatch(match_type, domain_pattern, expected_host_name)) {
+      if (!DomainMatch(match_type, domain_pattern, expected_server_name)) {
         continue;
       }
       // Choose this match.
@@ -512,48 +1317,53 @@ grpc_error* RouteConfigParse(
     return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
         "No route found in the virtual host.");
   }
-  // Only look at the last one in the route list (the default route),
-  const envoy_api_v2_route_Route* route = routes[size - 1];
-  // Validate that the match field must have a prefix field which is an empty
-  // string.
-  const envoy_api_v2_route_RouteMatch* match =
-      envoy_api_v2_route_Route_match(route);
-  if (!envoy_api_v2_route_RouteMatch_has_prefix(match)) {
-    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "No prefix field found in RouteMatch.");
-  }
-  const upb_strview prefix = envoy_api_v2_route_RouteMatch_prefix(match);
-  if (!upb_strview_eql(prefix, upb_strview_makez(""))) {
-    return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Prefix is not empty string.");
-  }
-  if (!envoy_api_v2_route_Route_has_route(route)) {
-    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "No RouteAction found in route.");
+  // Loop over the whole list of routes
+  for (size_t i = 0; i < size; ++i) {
+    const envoy_api_v2_route_Route* route = routes[i];
+    const envoy_api_v2_route_RouteMatch* match =
+        envoy_api_v2_route_Route_match(route);
+    size_t query_parameters_size;
+    static_cast<void>(envoy_api_v2_route_RouteMatch_query_parameters(
+        match, &query_parameters_size));
+    if (query_parameters_size > 0) {
+      continue;
+    }
+    XdsApi::RdsUpdate::RdsRoute rds_route;
+    bool ignore_route = false;
+    grpc_error* error = RoutePathMatchParse(match, &rds_route, &ignore_route);
+    if (error != GRPC_ERROR_NONE) return error;
+    if (ignore_route) continue;
+    error = RouteHeaderMatchersParse(match, &rds_route);
+    if (error != GRPC_ERROR_NONE) return error;
+    error = RouteRuntimeFractionParse(match, &rds_route);
+    if (error != GRPC_ERROR_NONE) return error;
+    error = RouteActionParse(route, &rds_route, &ignore_route);
+    if (error != GRPC_ERROR_NONE) return error;
+    if (ignore_route) continue;
+    const google_protobuf_BoolValue* case_sensitive =
+        envoy_api_v2_route_RouteMatch_case_sensitive(match);
+    if (case_sensitive != nullptr &&
+        !google_protobuf_BoolValue_value(case_sensitive)) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "case_sensitive if set must be set to true.");
+    }
+    rds_update->routes.emplace_back(std::move(rds_route));
   }
-  const envoy_api_v2_route_RouteAction* route_action =
-      envoy_api_v2_route_Route_route(route);
-  // Get the cluster in the RouteAction.
-  if (!envoy_api_v2_route_RouteAction_has_cluster(route_action)) {
-    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "No cluster found in RouteAction.");
+  if (rds_update->routes.empty()) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING("No valid routes specified.");
   }
-  const upb_strview cluster =
-      envoy_api_v2_route_RouteAction_cluster(route_action);
-  rds_update->cluster_name = std::string(cluster.data, cluster.size);
   return GRPC_ERROR_NONE;
 }
 
-grpc_error* LdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
+grpc_error* LdsResponseParse(XdsClient* client, TraceFlag* tracer,
+                             const envoy_api_v2_DiscoveryResponse* response,
                              const std::string& expected_server_name,
-                             XdsApi::LdsUpdate* lds_update, upb_arena* arena) {
+                             absl::optional<XdsApi::LdsUpdate>* lds_update,
+                             upb_arena* arena) {
   // Get the resources from the response.
   size_t size;
   const google_protobuf_Any* const* resources =
       envoy_api_v2_DiscoveryResponse_resources(response, &size);
-  if (size < 1) {
-    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "LDS response contains 0 resource.");
-  }
   for (size_t i = 0; i < size; ++i) {
     // Check the type_url of the resource.
     const upb_strview type_url = google_protobuf_Any_type_url(resources[i]);
@@ -578,7 +1388,7 @@ grpc_error* LdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
         envoy_api_v2_Listener_api_listener(listener);
     if (api_listener == nullptr) {
       return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-          "Listener doesn't have ApiListener.");
+          "Listener has no ApiListener.");
     }
     const upb_strview encoded_api_listener = google_protobuf_Any_value(
         envoy_config_listener_v2_ApiListener_api_listener(api_listener));
@@ -593,14 +1403,11 @@ grpc_error* LdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
           envoy_config_filter_network_http_connection_manager_v2_HttpConnectionManager_route_config(
               http_connection_manager);
       XdsApi::RdsUpdate rds_update;
-      grpc_error* error =
-          RouteConfigParse(route_config, expected_server_name, &rds_update);
+      grpc_error* error = RouteConfigParse(client, tracer, route_config,
+                                           expected_server_name, &rds_update);
       if (error != GRPC_ERROR_NONE) return error;
-      lds_update->rds_update.emplace(std::move(rds_update));
-      const upb_strview route_config_name =
-          envoy_api_v2_RouteConfiguration_name(route_config);
-      lds_update->route_config_name =
-          std::string(route_config_name.data, route_config_name.size);
+      lds_update->emplace();
+      (*lds_update)->rds_update.emplace(std::move(rds_update));
       return GRPC_ERROR_NONE;
     }
     // Validate that RDS must be used to get the route_config dynamically.
@@ -609,33 +1416,41 @@ grpc_error* LdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
       return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
           "HttpConnectionManager neither has inlined route_config nor RDS.");
     }
-    // Get the route_config_name.
     const envoy_config_filter_network_http_connection_manager_v2_Rds* rds =
         envoy_config_filter_network_http_connection_manager_v2_HttpConnectionManager_rds(
             http_connection_manager);
-    const upb_strview route_config_name =
-        envoy_config_filter_network_http_connection_manager_v2_Rds_route_config_name(
+    // Check that the ConfigSource specifies ADS.
+    const envoy_api_v2_core_ConfigSource* config_source =
+        envoy_config_filter_network_http_connection_manager_v2_Rds_config_source(
             rds);
-    lds_update->route_config_name =
-        std::string(route_config_name.data, route_config_name.size);
+    if (config_source == nullptr) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "HttpConnectionManager missing config_source for RDS.");
+    }
+    if (!envoy_api_v2_core_ConfigSource_has_ads(config_source)) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "HttpConnectionManager ConfigSource for RDS does not specify ADS.");
+    }
+    // Get the route_config_name.
+    lds_update->emplace();
+    (*lds_update)->route_config_name = UpbStringToStdString(
+        envoy_config_filter_network_http_connection_manager_v2_Rds_route_config_name(
+            rds));
     return GRPC_ERROR_NONE;
   }
-  return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-      "No listener found for expected server name.");
+  return GRPC_ERROR_NONE;
 }
 
-grpc_error* RdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
-                             const std::string& expected_server_name,
-                             const std::string& expected_route_config_name,
-                             XdsApi::RdsUpdate* rds_update, upb_arena* arena) {
+grpc_error* RdsResponseParse(
+    XdsClient* client, TraceFlag* tracer,
+    const envoy_api_v2_DiscoveryResponse* response,
+    const std::string& expected_server_name,
+    const std::set<absl::string_view>& expected_route_configuration_names,
+    absl::optional<XdsApi::RdsUpdate>* rds_update, upb_arena* arena) {
   // Get the resources from the response.
   size_t size;
   const google_protobuf_Any* const* resources =
       envoy_api_v2_DiscoveryResponse_resources(response, &size);
-  if (size < 1) {
-    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "RDS response contains 0 resource.");
-  }
   for (size_t i = 0; i < size; ++i) {
     // Check the type_url of the resource.
     const upb_strview type_url = google_protobuf_Any_type_url(resources[i]);
@@ -652,33 +1467,34 @@ grpc_error* RdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
       return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode route_config.");
     }
     // Check route_config_name. Ignore unexpected route_config.
-    const upb_strview name = envoy_api_v2_RouteConfiguration_name(route_config);
-    const upb_strview expected_name =
-        upb_strview_makez(expected_route_config_name.c_str());
-    if (!upb_strview_eql(name, expected_name)) continue;
+    const upb_strview route_config_name =
+        envoy_api_v2_RouteConfiguration_name(route_config);
+    absl::string_view route_config_name_strview(route_config_name.data,
+                                                route_config_name.size);
+    if (expected_route_configuration_names.find(route_config_name_strview) ==
+        expected_route_configuration_names.end()) {
+      continue;
+    }
     // Parse the route_config.
     XdsApi::RdsUpdate local_rds_update;
-    grpc_error* error =
-        RouteConfigParse(route_config, expected_server_name, &local_rds_update);
+    grpc_error* error = RouteConfigParse(
+        client, tracer, route_config, expected_server_name, &local_rds_update);
     if (error != GRPC_ERROR_NONE) return error;
-    *rds_update = std::move(local_rds_update);
+    rds_update->emplace(std::move(local_rds_update));
     return GRPC_ERROR_NONE;
   }
-  return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-      "No route config found for expected name.");
+  return GRPC_ERROR_NONE;
 }
 
-grpc_error* CdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
-                             XdsApi::CdsUpdateMap* cds_update_map,
-                             upb_arena* arena) {
+grpc_error* CdsResponseParse(
+    XdsClient* client, TraceFlag* tracer,
+    const envoy_api_v2_DiscoveryResponse* response,
+    const std::set<absl::string_view>& expected_cluster_names,
+    XdsApi::CdsUpdateMap* cds_update_map, upb_arena* arena) {
   // Get the resources from the response.
   size_t size;
   const google_protobuf_Any* const* resources =
       envoy_api_v2_DiscoveryResponse_resources(response, &size);
-  if (size < 1) {
-    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "CDS response contains 0 resource.");
-  }
   // Parse all the resources in the CDS response.
   for (size_t i = 0; i < size; ++i) {
     XdsApi::CdsUpdate cds_update;
@@ -694,6 +1510,15 @@ grpc_error* CdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
     if (cluster == nullptr) {
       return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode cluster.");
     }
+    MaybeLogCluster(client, tracer, cluster);
+    // Ignore unexpected cluster names.
+    upb_strview cluster_name = envoy_api_v2_Cluster_name(cluster);
+    absl::string_view cluster_name_strview(cluster_name.data,
+                                           cluster_name.size);
+    if (expected_cluster_names.find(cluster_name_strview) ==
+        expected_cluster_names.end()) {
+      continue;
+    }
     // Check the cluster_discovery_type.
     if (!envoy_api_v2_Cluster_has_type(cluster)) {
       return GRPC_ERROR_CREATE_FROM_STATIC_STRING("DiscoveryType not found.");
@@ -707,14 +1532,14 @@ grpc_error* CdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
     const envoy_api_v2_core_ConfigSource* eds_config =
         envoy_api_v2_Cluster_EdsClusterConfig_eds_config(eds_cluster_config);
     if (!envoy_api_v2_core_ConfigSource_has_ads(eds_config)) {
-      return GRPC_ERROR_CREATE_FROM_STATIC_STRING("ConfigSource is not ADS.");
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "EDS ConfigSource is not ADS.");
     }
     // Record EDS service_name (if any).
     upb_strview service_name =
         envoy_api_v2_Cluster_EdsClusterConfig_service_name(eds_cluster_config);
     if (service_name.size != 0) {
-      cds_update.eds_service_name =
-          std::string(service_name.data, service_name.size);
+      cds_update.eds_service_name = UpbStringToStdString(service_name);
     }
     // Check the LB policy.
     if (envoy_api_v2_Cluster_lb_policy(cluster) !=
@@ -728,12 +1553,11 @@ grpc_error* CdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
     if (lrs_server != nullptr) {
       if (!envoy_api_v2_core_ConfigSource_has_self(lrs_server)) {
         return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-            "ConfigSource is not self.");
+            "LRS ConfigSource is not self.");
       }
       cds_update.lrs_load_reporting_server_name.emplace("");
     }
-    upb_strview cluster_name = envoy_api_v2_Cluster_name(cluster);
-    cds_update_map->emplace(std::string(cluster_name.data, cluster_name.size),
+    cds_update_map->emplace(UpbStringToStdString(cluster_name),
                             std::move(cds_update));
   }
   return GRPC_ERROR_NONE;
@@ -794,8 +1618,8 @@ grpc_error* LocalityParse(
   upb_strview zone = envoy_api_v2_core_Locality_region(locality);
   upb_strview sub_zone = envoy_api_v2_core_Locality_sub_zone(locality);
   output_locality->name = MakeRefCounted<XdsLocalityName>(
-      std::string(region.data, region.size), std::string(zone.data, zone.size),
-      std::string(sub_zone.data, sub_zone.size));
+      UpbStringToStdString(region), UpbStringToStdString(zone),
+      UpbStringToStdString(sub_zone));
   // Parse the addresses.
   size_t size;
   const envoy_api_v2_endpoint_LbEndpoint* const* lb_endpoints =
@@ -814,7 +1638,7 @@ grpc_error* LocalityParse(
 
 grpc_error* DropParseAndAppend(
     const envoy_api_v2_ClusterLoadAssignment_Policy_DropOverload* drop_overload,
-    XdsApi::DropConfig* drop_config, bool* drop_all) {
+    XdsApi::DropConfig* drop_config) {
   // Get the category.
   upb_strview category =
       envoy_api_v2_ClusterLoadAssignment_Policy_DropOverload_category(
@@ -845,24 +1669,19 @@ grpc_error* DropParseAndAppend(
   }
   // Cap numerator to 1000000.
   numerator = GPR_MIN(numerator, 1000000);
-  if (numerator == 1000000) *drop_all = true;
-  drop_config->AddCategory(std::string(category.data, category.size),
-                           numerator);
+  drop_config->AddCategory(UpbStringToStdString(category), numerator);
   return GRPC_ERROR_NONE;
 }
 
-grpc_error* EdsResponsedParse(
+grpc_error* EdsResponseParse(
+    XdsClient* client, TraceFlag* tracer,
     const envoy_api_v2_DiscoveryResponse* response,
-    const std::set<StringView>& expected_eds_service_names,
+    const std::set<absl::string_view>& expected_eds_service_names,
     XdsApi::EdsUpdateMap* eds_update_map, upb_arena* arena) {
   // Get the resources from the response.
   size_t size;
   const google_protobuf_Any* const* resources =
       envoy_api_v2_DiscoveryResponse_resources(response, &size);
-  if (size < 1) {
-    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "EDS response contains 0 resource.");
-  }
   for (size_t i = 0; i < size; ++i) {
     XdsApi::EdsUpdate eds_update;
     // Check the type_url of the resource.
@@ -881,11 +1700,13 @@ grpc_error* EdsResponsedParse(
       return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
           "Can't parse cluster_load_assignment.");
     }
+    MaybeLogClusterLoadAssignment(client, tracer, cluster_load_assignment);
     // Check the cluster name (which actually means eds_service_name). Ignore
     // unexpected names.
     upb_strview cluster_name = envoy_api_v2_ClusterLoadAssignment_cluster_name(
         cluster_load_assignment);
-    StringView cluster_name_strview(cluster_name.data, cluster_name.size);
+    absl::string_view cluster_name_strview(cluster_name.data,
+                                           cluster_name.size);
     if (expected_eds_service_names.find(cluster_name_strview) ==
         expected_eds_service_names.end()) {
       continue;
@@ -903,6 +1724,14 @@ grpc_error* EdsResponsedParse(
       if (locality.lb_weight == 0) continue;
       eds_update.priority_list_update.Add(locality);
     }
+    for (uint32_t priority = 0;
+         priority < eds_update.priority_list_update.size(); ++priority) {
+      auto* locality_map = eds_update.priority_list_update.Find(priority);
+      if (locality_map == nullptr || locality_map->size() == 0) {
+        return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+            "EDS update includes sparse priority list");
+      }
+    }
     // Get the drop config.
     eds_update.drop_config = MakeRefCounted<XdsApi::DropConfig>();
     const envoy_api_v2_ClusterLoadAssignment_Policy* policy =
@@ -915,18 +1744,11 @@ grpc_error* EdsResponsedParse(
                   policy, &drop_size);
       for (size_t j = 0; j < drop_size; ++j) {
         grpc_error* error =
-            DropParseAndAppend(drop_overload[j], eds_update.drop_config.get(),
-                               &eds_update.drop_all);
+            DropParseAndAppend(drop_overload[j], eds_update.drop_config.get());
         if (error != GRPC_ERROR_NONE) return error;
       }
     }
-    // Validate the update content.
-    if (eds_update.priority_list_update.empty() && !eds_update.drop_all) {
-      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-          "EDS response doesn't contain any valid "
-          "locality but doesn't require to drop all calls.");
-    }
-    eds_update_map->emplace(std::string(cluster_name.data, cluster_name.size),
+    eds_update_map->emplace(UpbStringToStdString(cluster_name),
                             std::move(eds_update));
   }
   return GRPC_ERROR_NONE;
@@ -936,9 +1758,11 @@ grpc_error* EdsResponsedParse(
 
 grpc_error* XdsApi::ParseAdsResponse(
     const grpc_slice& encoded_response, const std::string& expected_server_name,
-    const std::string& expected_route_config_name,
-    const std::set<StringView>& expected_eds_service_names,
-    LdsUpdate* lds_update, RdsUpdate* rds_update, CdsUpdateMap* cds_update_map,
+    const std::set<absl::string_view>& expected_route_configuration_names,
+    const std::set<absl::string_view>& expected_cluster_names,
+    const std::set<absl::string_view>& expected_eds_service_names,
+    absl::optional<LdsUpdate>* lds_update,
+    absl::optional<RdsUpdate>* rds_update, CdsUpdateMap* cds_update_map,
     EdsUpdateMap* eds_update_map, std::string* version, std::string* nonce,
     std::string* type_url) {
   upb::Arena arena;
@@ -953,28 +1777,31 @@ grpc_error* XdsApi::ParseAdsResponse(
     return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
         "Can't decode the whole response.");
   }
+  MaybeLogDiscoveryResponse(client_, tracer_, response);
   // Record the type_url, the version_info, and the nonce of the response.
   upb_strview type_url_strview =
       envoy_api_v2_DiscoveryResponse_type_url(response);
-  *type_url = std::string(type_url_strview.data, type_url_strview.size);
+  *type_url = UpbStringToStdString(type_url_strview);
   upb_strview version_info =
       envoy_api_v2_DiscoveryResponse_version_info(response);
-  *version = std::string(version_info.data, version_info.size);
+  *version = UpbStringToStdString(version_info);
   upb_strview nonce_strview = envoy_api_v2_DiscoveryResponse_nonce(response);
-  *nonce = std::string(nonce_strview.data, nonce_strview.size);
+  *nonce = UpbStringToStdString(nonce_strview);
   // Parse the response according to the resource type.
   if (*type_url == kLdsTypeUrl) {
-    return LdsResponseParse(response, expected_server_name, lds_update,
-                            arena.ptr());
+    return LdsResponseParse(client_, tracer_, response, expected_server_name,
+                            lds_update, arena.ptr());
   } else if (*type_url == kRdsTypeUrl) {
-    return RdsResponseParse(response, expected_server_name,
-                            expected_route_config_name, rds_update,
+    return RdsResponseParse(client_, tracer_, response, expected_server_name,
+                            expected_route_configuration_names, rds_update,
                             arena.ptr());
   } else if (*type_url == kCdsTypeUrl) {
-    return CdsResponseParse(response, cds_update_map, arena.ptr());
+    return CdsResponseParse(client_, tracer_, response, expected_cluster_names,
+                            cds_update_map, arena.ptr());
   } else if (*type_url == kEdsTypeUrl) {
-    return EdsResponsedParse(response, expected_eds_service_names,
-                             eds_update_map, arena.ptr());
+    return EdsResponseParse(client_, tracer_, response,
+                            expected_eds_service_names, eds_update_map,
+                            arena.ptr());
   } else {
     return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
         "Unsupported ADS resource type.");
@@ -983,6 +1810,121 @@ grpc_error* XdsApi::ParseAdsResponse(
 
 namespace {
 
+void MaybeLogLrsRequest(
+    XdsClient* client, TraceFlag* tracer,
+    const envoy_service_load_stats_v2_LoadStatsRequest* request) {
+  if (GRPC_TRACE_FLAG_ENABLED(*tracer) &&
+      gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+    // TODO(roth): When we can upgrade upb, use upb textformat code to dump
+    // the raw proto instead of doing this manually.
+    std::vector<std::string> fields;
+    // node
+    const auto* node =
+        envoy_service_load_stats_v2_LoadStatsRequest_node(request);
+    if (node != nullptr) {
+      AddNodeLogFields(node, &fields);
+    }
+    // cluster_stats
+    size_t num_cluster_stats;
+    const struct envoy_api_v2_endpoint_ClusterStats* const* cluster_stats =
+        envoy_service_load_stats_v2_LoadStatsRequest_cluster_stats(
+            request, &num_cluster_stats);
+    for (size_t i = 0; i < num_cluster_stats; ++i) {
+      const auto* cluster_stat = cluster_stats[i];
+      fields.emplace_back("cluster_stats {");
+      // cluster_name
+      AddStringField(
+          "  cluster_name",
+          envoy_api_v2_endpoint_ClusterStats_cluster_name(cluster_stat),
+          &fields);
+      // cluster_service_name
+      AddStringField(
+          "  cluster_service_name",
+          envoy_api_v2_endpoint_ClusterStats_cluster_service_name(cluster_stat),
+          &fields);
+      // upstream_locality_stats
+      size_t num_stats;
+      const envoy_api_v2_endpoint_UpstreamLocalityStats* const* stats =
+          envoy_api_v2_endpoint_ClusterStats_upstream_locality_stats(
+              cluster_stat, &num_stats);
+      for (size_t j = 0; j < num_stats; ++j) {
+        const auto* stat = stats[j];
+        fields.emplace_back("  upstream_locality_stats {");
+        // locality
+        const auto* locality =
+            envoy_api_v2_endpoint_UpstreamLocalityStats_locality(stat);
+        if (locality != nullptr) {
+          fields.emplace_back("    locality {");
+          AddLocalityField(3, locality, &fields);
+          fields.emplace_back("    }");
+        }
+        // total_successful_requests
+        fields.emplace_back(absl::StrCat(
+            "    total_successful_requests: ",
+            envoy_api_v2_endpoint_UpstreamLocalityStats_total_successful_requests(
+                stat)));
+        // total_requests_in_progress
+        fields.emplace_back(absl::StrCat(
+            "    total_requests_in_progress: ",
+            envoy_api_v2_endpoint_UpstreamLocalityStats_total_requests_in_progress(
+                stat)));
+        // total_error_requests
+        fields.emplace_back(absl::StrCat(
+            "    total_error_requests: ",
+            envoy_api_v2_endpoint_UpstreamLocalityStats_total_error_requests(
+                stat)));
+        // total_issued_requests
+        fields.emplace_back(absl::StrCat(
+            "    total_issued_requests: ",
+            envoy_api_v2_endpoint_UpstreamLocalityStats_total_issued_requests(
+                stat)));
+        fields.emplace_back("  }");
+      }
+      // total_dropped_requests
+      fields.emplace_back(absl::StrCat(
+          "  total_dropped_requests: ",
+          envoy_api_v2_endpoint_ClusterStats_total_dropped_requests(
+              cluster_stat)));
+      // dropped_requests
+      size_t num_drops;
+      const envoy_api_v2_endpoint_ClusterStats_DroppedRequests* const* drops =
+          envoy_api_v2_endpoint_ClusterStats_dropped_requests(cluster_stat,
+                                                              &num_drops);
+      for (size_t j = 0; j < num_drops; ++j) {
+        const auto* drop = drops[j];
+        fields.emplace_back("  dropped_requests {");
+        // category
+        AddStringField(
+            "    category",
+            envoy_api_v2_endpoint_ClusterStats_DroppedRequests_category(drop),
+            &fields);
+        // dropped_count
+        fields.emplace_back(absl::StrCat(
+            "    dropped_count: ",
+            envoy_api_v2_endpoint_ClusterStats_DroppedRequests_dropped_count(
+                drop)));
+        fields.emplace_back("  }");
+      }
+      // load_report_interval
+      const auto* load_report_interval =
+          envoy_api_v2_endpoint_ClusterStats_load_report_interval(cluster_stat);
+      if (load_report_interval != nullptr) {
+        fields.emplace_back("  load_report_interval {");
+        fields.emplace_back(absl::StrCat(
+            "    seconds: ",
+            google_protobuf_Duration_seconds(load_report_interval)));
+        fields.emplace_back(
+            absl::StrCat("    nanos: ",
+                         google_protobuf_Duration_nanos(load_report_interval)));
+        fields.emplace_back("  }");
+      }
+      fields.emplace_back("}");
+    }
+    gpr_log(GPR_DEBUG, "[xds_client %p] constructed LRS request: %s", client,
+            absl::StrJoin(fields, "\n").c_str());
+  }
+}
+
 grpc_slice SerializeLrsRequest(
     const envoy_service_load_stats_v2_LoadStatsRequest* request,
     upb_arena* arena) {
@@ -1005,6 +1947,10 @@ grpc_slice XdsApi::CreateLrsInitialRequest(const std::string& server_name) {
                                                                 arena.ptr());
   PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_,
                server_name, node_msg);
+  envoy_api_v2_core_Node_add_client_features(
+      node_msg, upb_strview_makez("envoy.lrs.supports_send_all_clusters"),
+      arena.ptr());
+  MaybeLogLrsRequest(client_, tracer_, request);
   return SerializeLrsRequest(request, arena.ptr());
 }
 
@@ -1117,10 +2063,12 @@ grpc_slice XdsApi::CreateLrsRequest(
     google_protobuf_Duration_set_seconds(load_report_interval, timespec.tv_sec);
     google_protobuf_Duration_set_nanos(load_report_interval, timespec.tv_nsec);
   }
+  MaybeLogLrsRequest(client_, tracer_, request);
   return SerializeLrsRequest(request, arena.ptr());
 }
 
 grpc_error* XdsApi::ParseLrsResponse(const grpc_slice& encoded_response,
+                                     bool* send_all_clusters,
                                      std::set<std::string>* cluster_names,
                                      grpc_millis* load_reporting_interval) {
   upb::Arena arena;
@@ -1133,13 +2081,19 @@ grpc_error* XdsApi::ParseLrsResponse(const grpc_slice& encoded_response,
   if (decoded_response == nullptr) {
     return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode response.");
   }
-  // Store the cluster names.
-  size_t size;
-  const upb_strview* clusters =
-      envoy_service_load_stats_v2_LoadStatsResponse_clusters(decoded_response,
-                                                             &size);
-  for (size_t i = 0; i < size; ++i) {
-    cluster_names->emplace(clusters[i].data, clusters[i].size);
+  // Check send_all_clusters.
+  if (envoy_service_load_stats_v2_LoadStatsResponse_send_all_clusters(
+          decoded_response)) {
+    *send_all_clusters = true;
+  } else {
+    // Store the cluster names.
+    size_t size;
+    const upb_strview* clusters =
+        envoy_service_load_stats_v2_LoadStatsResponse_clusters(decoded_response,
+                                                               &size);
+    for (size_t i = 0; i < size; ++i) {
+      cluster_names->emplace(clusters[i].data, clusters[i].size);
+    }
   }
   // Get the load report interval.
   const google_protobuf_Duration* load_reporting_interval_duration =