grpc 1.56.2 → 1.57.0.pre1

data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc

@@ -17,7 +17,6 @@
 #include <grpc/support/port_platform.h>
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
@@ -47,7 +46,6 @@
 
 #include <grpc/grpc.h>
 
-#include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/slice/slice.h"
 
 #define XXH_INLINE_ALL
@@ -102,43 +100,21 @@ namespace grpc_core {
 
 TraceFlag grpc_xds_resolver_trace(false, "xds_resolver");
 
-UniqueTypeName XdsClusterAttribute::TypeName() {
-  static UniqueTypeName::Factory kFactory("xds_cluster_name");
-  return kFactory.Create();
-}
-
 namespace {
 
-std::string GetDefaultAuthorityInternal(const URI& uri) {
-  // Obtain the authority to use for the data plane connections, which is
-  // also used to select the right VirtualHost from the RouteConfiguration.
-  // We need to take the part of the URI path following the last
-  // "/" character or the entire path if the path contains no "/" character.
-  size_t pos = uri.path().find_last_of('/');
-  if (pos == uri.path().npos) return uri.path();
-  return uri.path().substr(pos + 1);
-}
-
-std::string GetDataPlaneAuthority(const ChannelArgs& args, const URI& uri) {
-  absl::optional<std::string> authority =
-      args.GetOwnedString(GRPC_ARG_DEFAULT_AUTHORITY);
-  if (authority.has_value()) return std::move(*authority);
-  return GetDefaultAuthorityInternal(uri);
-}
-
 //
 // XdsResolver
 //
 
 class XdsResolver : public Resolver {
  public:
-  explicit XdsResolver(ResolverArgs args)
+  XdsResolver(ResolverArgs args, std::string data_plane_authority)
       : work_serializer_(std::move(args.work_serializer)),
         result_handler_(std::move(args.result_handler)),
         args_(std::move(args.args)),
         interested_parties_(args.pollset_set),
         uri_(std::move(args.uri)),
-        data_plane_authority_(GetDataPlaneAuthority(args_, uri_)),
+        data_plane_authority_(std::move(data_plane_authority)),
         channel_id_(absl::Uniform<uint64_t>(absl::BitGen())) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
       gpr_log(
@@ -246,15 +222,15 @@ class XdsResolver : public Resolver {
   // the cluster by the ConfigSelector.  The ref for each call is held
   // until the call is committed.  When the strong refs go away, we hop
   // back into the WorkSerializer to remove the entry from the map.
-  class ClusterState : public DualRefCounted<ClusterState> {
+  class ClusterRef : public DualRefCounted<ClusterRef> {
    public:
-    ClusterState(RefCountedPtr<XdsResolver> resolver,
-                 absl::string_view cluster_name)
+    ClusterRef(RefCountedPtr<XdsResolver> resolver,
+               absl::string_view cluster_name)
         : resolver_(std::move(resolver)), cluster_name_(cluster_name) {}
 
     void Orphan() override {
-      auto* resolver = resolver_.get();
-      resolver->work_serializer_->Run(
+      XdsResolver* resolver_ptr = resolver_.get();
+      resolver_ptr->work_serializer_->Run(
           [resolver = std::move(resolver_)]() {
             resolver->MaybeRemoveUnusedClusters();
           },
@@ -268,21 +244,49 @@ class XdsResolver : public Resolver {
     std::string cluster_name_;
   };
 
-  // A map containing cluster refs held by the XdsConfigSelector. A ref to
-  // this map will be taken by each call processed by the XdsConfigSelector,
-  // stored in a the call's call attributes, and later unreffed
-  // by the ClusterSelection filter.
-  class XdsClusterMap : public RefCounted<XdsClusterMap> {
+  // A routing data including cluster refs and routes table held by the
+  // XdsConfigSelector. A ref to this map will be taken by each call processed
+  // by the XdsConfigSelector, stored in a the call's call attributes, and later
+  // unreffed by the ClusterSelection filter.
+  class RouteConfigData : public RefCounted<RouteConfigData> {
    public:
-    explicit XdsClusterMap(
-        std::map<absl::string_view, RefCountedPtr<ClusterState>> clusters)
-        : clusters_(std::move(clusters)) {}
+    struct RouteEntry {
+      struct ClusterWeightState {
+        uint32_t range_end;
+        absl::string_view cluster;
+        RefCountedPtr<ServiceConfig> method_config;
+
+        bool operator==(const ClusterWeightState& other) const {
+          return range_end == other.range_end && cluster == other.cluster &&
+                 MethodConfigsEqual(method_config.get(),
+                                    other.method_config.get());
+        }
+      };
+
+      XdsRouteConfigResource::Route route;
+      RefCountedPtr<ServiceConfig> method_config;
+      std::vector<ClusterWeightState> weighted_cluster_state;
+
+      explicit RouteEntry(const XdsRouteConfigResource::Route& r) : route(r) {}
+
+      bool operator==(const RouteEntry& other) const {
+        return route == other.route &&
+               weighted_cluster_state == other.weighted_cluster_state &&
+               MethodConfigsEqual(method_config.get(),
+                                  other.method_config.get());
+      }
+    };
 
-    bool operator==(const XdsClusterMap& other) const {
-      return clusters_ == other.clusters_;
+    static absl::StatusOr<RefCountedPtr<RouteConfigData>> Create(
+        XdsResolver* resolver,
+        const std::vector<XdsRouteConfigResource::Route>& routes,
+        const Duration& default_max_stream_duration);
+
+    bool operator==(const RouteConfigData& other) const {
+      return clusters_ == other.clusters_ && routes_ == other.routes_;
     }
 
-    RefCountedPtr<ClusterState> Find(absl::string_view name) const {
+    RefCountedPtr<ClusterRef> FindClusterRef(absl::string_view name) const {
       auto it = clusters_.find(name);
       if (it == clusters_.end()) {
         return nullptr;
@@ -290,14 +294,36 @@ class XdsResolver : public Resolver {
       return it->second;
     }
 
+    RouteEntry* GetRouteForRequest(absl::string_view path,
+                                   grpc_metadata_batch* initial_metadata);
+
    private:
-    std::map<absl::string_view, RefCountedPtr<ClusterState>> clusters_;
+    class RouteListIterator;
+
+    static absl::StatusOr<RefCountedPtr<ServiceConfig>> CreateMethodConfig(
+        XdsResolver* resolver, const XdsRouteConfigResource::Route& route,
+        const XdsRouteConfigResource::Route::RouteAction::ClusterWeight*
+            cluster_weight);
+
+    static bool MethodConfigsEqual(const ServiceConfig* sc1,
+                                   const ServiceConfig* sc2) {
+      if (sc1 == nullptr) return sc2 == nullptr;
+      if (sc2 == nullptr) return false;
+      return sc1->json_string() == sc2->json_string();
+    }
+
+    absl::Status AddRouteEntry(const XdsRouteConfigResource::Route& route,
+                               const Duration& default_max_stream_duration,
+                               XdsResolver* resolver);
+
+    std::map<absl::string_view, RefCountedPtr<ClusterRef>> clusters_;
+    std::vector<RouteEntry> routes_;
   };
 
   class XdsConfigSelector : public ConfigSelector {
    public:
     XdsConfigSelector(RefCountedPtr<XdsResolver> resolver,
-                      absl::Status* status);
+                      RefCountedPtr<RouteConfigData> route_config_data);
     ~XdsConfigSelector() override;
 
     const char* name() const override { return "XdsConfigSelector"; }
@@ -305,8 +331,8 @@ class XdsResolver : public Resolver {
     bool Equals(const ConfigSelector* other) const override {
       const auto* other_xds = static_cast<const XdsConfigSelector*>(other);
       // Don't need to compare resolver_, since that will always be the same.
-      return route_table_ == other_xds->route_table_ &&
-             *cluster_map_ == *other_xds->cluster_map_;
+      return *route_config_data_ == *other_xds->route_config_data_ &&
+             filters_ == other_xds->filters_;
     }
 
     absl::Status GetCallConfig(GetCallConfigArgs args) override;
@@ -316,34 +342,28 @@ class XdsResolver : public Resolver {
     }
 
    private:
-    struct Route {
-      struct ClusterWeightState {
-        uint32_t range_end;
-        absl::string_view cluster;
-        RefCountedPtr<ServiceConfig> method_config;
-
-        bool operator==(const ClusterWeightState& other) const;
-      };
-
-      XdsRouteConfigResource::Route route;
-      RefCountedPtr<ServiceConfig> method_config;
-      std::vector<ClusterWeightState> weighted_cluster_state;
+    RefCountedPtr<XdsResolver> resolver_;
+    RefCountedPtr<RouteConfigData> route_config_data_;
+    std::vector<const grpc_channel_filter*> filters_;
+  };
 
-      bool operator==(const Route& other) const;
-    };
-    using RouteTable = std::vector<Route>;
+  class XdsRouteStateAttributeImpl : public XdsRouteStateAttribute {
+   public:
+    explicit XdsRouteStateAttributeImpl(
+        RefCountedPtr<RouteConfigData> route_config_data,
+        RouteConfigData::RouteEntry* route)
+        : route_config_data_(std::move(route_config_data)), route_(route) {}
 
-    class RouteListIterator;
+    // This method can be called only once. The first call will release
+    // the reference to the cluster map, and subsequent calls will return
+    // nullptr.
+    RefCountedPtr<ClusterRef> LockAndGetCluster(absl::string_view cluster_name);
 
-    absl::StatusOr<RefCountedPtr<ServiceConfig>> CreateMethodConfig(
-        const XdsRouteConfigResource::Route& route,
-        const XdsRouteConfigResource::Route::RouteAction::ClusterWeight*
-            cluster_weight);
+    bool HasClusterForRoute(absl::string_view cluster_name) const override;
 
-    RefCountedPtr<XdsResolver> resolver_;
-    RouteTable route_table_;
-    RefCountedPtr<XdsClusterMap> cluster_map_;
-    std::vector<const grpc_channel_filter*> filters_;
+   private:
+    RefCountedPtr<RouteConfigData> route_config_data_;
+    RouteConfigData::RouteEntry* route_;
   };
 
   class ClusterSelectionFilter : public ChannelFilter {
@@ -357,29 +377,7 @@ class XdsResolver : public Resolver {
 
     // Construct a promise for one call.
     ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-        CallArgs call_args, NextPromiseFactory next_promise_factory) override {
-      auto* service_config_call_data =
-          static_cast<ClientChannelServiceConfigCallData*>(
-              GetContext<grpc_call_context_element>()
-                  [GRPC_CONTEXT_SERVICE_CONFIG_CALL_DATA]
-                      .value);
-      GPR_ASSERT(service_config_call_data != nullptr);
-      auto* cluster_data = static_cast<XdsClusterMapAttribute*>(
-          service_config_call_data->GetCallAttribute(
-              XdsClusterMapAttribute::TypeName()));
-      auto* cluster_name_attribute = static_cast<XdsClusterAttribute*>(
-          service_config_call_data->GetCallAttribute(
-              XdsClusterAttribute::TypeName()));
-      if (cluster_data != nullptr && cluster_name_attribute != nullptr) {
-        auto cluster =
-            cluster_data->LockAndGetCluster(cluster_name_attribute->cluster());
-        if (cluster != nullptr) {
-          service_config_call_data->SetOnCommit(
-              [cluster = std::move(cluster)]() mutable { cluster.reset(); });
-        }
-      }
-      return next_promise_factory(std::move(call_args));
-    }
+        CallArgs call_args, NextPromiseFactory next_promise_factory) override;
 
    private:
     explicit ClusterSelectionFilter(ChannelFilter::Args filter_args)
@@ -388,46 +386,17 @@ class XdsResolver : public Resolver {
     ChannelFilter::Args filter_args_;
   };
 
-  RefCountedPtr<ClusterState> GetOrCreateClusterState(
+  RefCountedPtr<ClusterRef> GetOrCreateClusterRef(
       absl::string_view cluster_name) {
-    auto it = cluster_state_map_.find(cluster_name);
-    if (it == cluster_state_map_.end()) {
-      auto cluster = MakeRefCounted<ClusterState>(Ref(), cluster_name);
-      cluster_state_map_.emplace(cluster->cluster_name(), cluster->WeakRef());
+    auto it = cluster_ref_map_.find(cluster_name);
+    if (it == cluster_ref_map_.end()) {
+      auto cluster = MakeRefCounted<ClusterRef>(Ref(), cluster_name);
+      cluster_ref_map_.emplace(cluster->cluster_name(), cluster->WeakRef());
       return cluster;
     }
     return it->second->Ref();
   }
 
-  class XdsClusterMapAttribute
-      : public ServiceConfigCallData::CallAttributeInterface {
-   public:
-    static UniqueTypeName TypeName() {
-      static UniqueTypeName::Factory factory("xds_cluster_lb_data");
-      return factory.Create();
-    }
-
-    explicit XdsClusterMapAttribute(RefCountedPtr<XdsClusterMap> cluster_map)
-        : cluster_map_(std::move(cluster_map)) {}
-
-    // This method can be called only once. The first call will release the
-    // reference to the cluster map, and subsequent calls will return nullptr.
-    RefCountedPtr<ClusterState> LockAndGetCluster(
-        absl::string_view cluster_name) {
-      if (cluster_map_ == nullptr) {
-        return nullptr;
-      }
-      auto cluster = cluster_map_->Find(cluster_name);
-      cluster_map_.reset();
-      return cluster;
-    }
-
-    UniqueTypeName type() const override { return TypeName(); }
-
-   private:
-    RefCountedPtr<XdsClusterMap> cluster_map_;
-  };
-
   void OnListenerUpdate(XdsListenerResource listener);
   void OnRouteConfigUpdate(XdsRouteConfigResource rds_update);
   void OnError(absl::string_view context, absl::Status status);
@@ -461,188 +430,72 @@ class XdsResolver : public Resolver {
            std::string /*LB policy config*/>
       cluster_specifier_plugin_map_;
 
-  std::map<absl::string_view, WeakRefCountedPtr<ClusterState>>
-      cluster_state_map_;
+  std::map<absl::string_view, WeakRefCountedPtr<ClusterRef>> cluster_ref_map_;
 };
 
 //
-// XdsResolver::XdsConfigSelector::Route
+// XdsResolver::RouteConfigData::RouteListIterator
 //
 
-bool MethodConfigsEqual(const ServiceConfig* sc1, const ServiceConfig* sc2) {
-  if (sc1 == nullptr) return sc2 == nullptr;
-  if (sc2 == nullptr) return false;
-  return sc1->json_string() == sc2->json_string();
-}
-
-const grpc_channel_filter XdsResolver::ClusterSelectionFilter::kFilter =
-    MakePromiseBasedFilter<ClusterSelectionFilter, FilterEndpoint::kClient,
-                           kFilterExaminesServerInitialMetadata>(
-        "cluster_selection_filter");
-
-bool XdsResolver::XdsConfigSelector::Route::ClusterWeightState::operator==(
-    const ClusterWeightState& other) const {
-  return range_end == other.range_end && cluster == other.cluster &&
-         MethodConfigsEqual(method_config.get(), other.method_config.get());
-}
-
-bool XdsResolver::XdsConfigSelector::Route::operator==(
-    const Route& other) const {
-  return route == other.route &&
-         weighted_cluster_state == other.weighted_cluster_state &&
-         MethodConfigsEqual(method_config.get(), other.method_config.get());
-}
-
 // Implementation of XdsRouting::RouteListIterator for getting the matching
 // route for a request.
-class XdsResolver::XdsConfigSelector::RouteListIterator
+class XdsResolver::RouteConfigData::RouteListIterator
     : public XdsRouting::RouteListIterator {
  public:
-  explicit RouteListIterator(const RouteTable* route_table)
+  explicit RouteListIterator(const RouteConfigData* route_table)
       : route_table_(route_table) {}
 
-  size_t Size() const override { return route_table_->size(); }
+  size_t Size() const override { return route_table_->routes_.size(); }
 
   const XdsRouteConfigResource::Route::Matchers& GetMatchersForRoute(
       size_t index) const override {
-    return (*route_table_)[index].route.matchers;
+    return route_table_->routes_[index].route.matchers;
   }
 
  private:
-  const RouteTable* route_table_;
+  const RouteConfigData* route_table_;
 };
 
 //
-// XdsResolver::XdsConfigSelector
+// XdsResolver::RouteConfigData
 //
 
-XdsResolver::XdsConfigSelector::XdsConfigSelector(
-    RefCountedPtr<XdsResolver> resolver, absl::Status* status)
-    : resolver_(std::move(resolver)) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
-    gpr_log(GPR_INFO, "[xds_resolver %p] creating XdsConfigSelector %p",
-            resolver_.get(), this);
-  }
-  // 1. Construct the route table
-  // 2  Update resolver's cluster state map
-  // 3. Construct cluster list to hold on to entries in the cluster state
-  // map.
+absl::StatusOr<RefCountedPtr<XdsResolver::RouteConfigData>>
+XdsResolver::RouteConfigData::Create(
+    XdsResolver* resolver,
+    const std::vector<XdsRouteConfigResource::Route>& routes,
+    const Duration& default_max_stream_duration) {
+  auto data = MakeRefCounted<RouteConfigData>();
   // Reserve the necessary entries up-front to avoid reallocation as we add
   // elements. This is necessary because the string_view in the entry's
   // weighted_cluster_state field points to the memory in the route field, so
   // moving the entry in a reallocation will cause the string_view to point to
   // invalid data.
-  route_table_.reserve(resolver_->current_virtual_host_->routes.size());
-  std::map<absl::string_view, RefCountedPtr<ClusterState>> clusters;
-  auto maybe_add_cluster = [&](absl::string_view cluster_name) {
-    if (clusters.find(cluster_name) != clusters.end()) return;
-    auto cluster_state = resolver_->GetOrCreateClusterState(cluster_name);
-    absl::string_view name = cluster_state->cluster_name();
-    clusters.emplace(name, std::move(cluster_state));
-  };
-  for (auto& route : resolver_->current_virtual_host_->routes) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
-      gpr_log(GPR_INFO, "[xds_resolver %p] XdsConfigSelector %p: route: %s",
-              resolver_.get(), this, route.ToString().c_str());
-    }
-    route_table_.emplace_back();
-    auto& route_entry = route_table_.back();
-    route_entry.route = route;
-    auto* route_action =
-        absl::get_if<XdsRouteConfigResource::Route::RouteAction>(
-            &route_entry.route.action);
-    if (route_action != nullptr) {
-      // If the route doesn't specify a timeout, set its timeout to the global
-      // one.
-      if (!route_action->max_stream_duration.has_value()) {
-        route_action->max_stream_duration =
-            resolver_->current_listener_.http_max_stream_duration;
-      }
-      Match(
-          route_action->action,
-          // cluster name
-          [&](const XdsRouteConfigResource::Route::RouteAction::ClusterName&
-                  cluster_name) {
-            auto result = CreateMethodConfig(route_entry.route, nullptr);
-            if (!result.ok()) {
-              *status = result.status();
-              return;
-            }
-            route_entry.method_config = std::move(*result);
-            maybe_add_cluster(
-                absl::StrCat("cluster:", cluster_name.cluster_name));
-          },
-          // WeightedClusters
-          [&](const std::vector<
-              XdsRouteConfigResource::Route::RouteAction::ClusterWeight>&
-                  weighted_clusters) {
-            uint32_t end = 0;
-            for (const auto& weighted_cluster : weighted_clusters) {
-              Route::ClusterWeightState cluster_weight_state;
-              auto result =
-                  CreateMethodConfig(route_entry.route, &weighted_cluster);
-              if (!result.ok()) {
-                *status = result.status();
-                return;
-              }
-              cluster_weight_state.method_config = std::move(*result);
-              end += weighted_cluster.weight;
-              cluster_weight_state.range_end = end;
-              cluster_weight_state.cluster = weighted_cluster.name;
-              route_entry.weighted_cluster_state.push_back(
-                  std::move(cluster_weight_state));
-              maybe_add_cluster(
-                  absl::StrCat("cluster:", weighted_cluster.name));
-            }
-          },
-          // ClusterSpecifierPlugin
-          [&](const XdsRouteConfigResource::Route::RouteAction::
-                  ClusterSpecifierPluginName& cluster_specifier_plugin_name) {
-            auto result = CreateMethodConfig(route_entry.route, nullptr);
-            if (!result.ok()) {
-              *status = result.status();
-              return;
-            }
-            route_entry.method_config = std::move(*result);
-            maybe_add_cluster(absl::StrCat(
-                "cluster_specifier_plugin:",
-                cluster_specifier_plugin_name.cluster_specifier_plugin_name));
-          });
-      if (!status->ok()) return;
-    }
-  }
-  cluster_map_ = MakeRefCounted<XdsClusterMap>(std::move(clusters));
-  // Populate filter list.
-  const auto& http_filter_registry =
-      static_cast<const GrpcXdsBootstrap&>(resolver_->xds_client_->bootstrap())
-          .http_filter_registry();
-  for (const auto& http_filter : resolver_->current_listener_.http_filters) {
-    // Find filter.  This is guaranteed to succeed, because it's checked
-    // at config validation time in the XdsApi code.
-    const XdsHttpFilterImpl* filter_impl =
-        http_filter_registry.GetFilterForType(
-            http_filter.config.config_proto_type_name);
-    GPR_ASSERT(filter_impl != nullptr);
-    // Add C-core filter to list.
-    if (filter_impl->channel_filter() != nullptr) {
-      filters_.push_back(filter_impl->channel_filter());
+  data->routes_.reserve(routes.size());
+  for (auto& route : routes) {
+    absl::Status status =
+        data->AddRouteEntry(route, default_max_stream_duration, resolver);
+    if (!status.ok()) {
+      return status;
     }
   }
-  filters_.push_back(&ClusterSelectionFilter::kFilter);
+  return data;
 }
 
-XdsResolver::XdsConfigSelector::~XdsConfigSelector() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
-    gpr_log(GPR_INFO, "[xds_resolver %p] destroying XdsConfigSelector %p",
-            resolver_.get(), this);
+XdsResolver::RouteConfigData::RouteEntry*
+XdsResolver::RouteConfigData::GetRouteForRequest(
+    absl::string_view path, grpc_metadata_batch* initial_metadata) {
+  auto route_index = XdsRouting::GetRouteForRequest(RouteListIterator(this),
+                                                    path, initial_metadata);
+  if (!route_index.has_value()) {
+    return nullptr;
   }
-  cluster_map_.reset();
-  resolver_->MaybeRemoveUnusedClusters();
+  return &routes_[*route_index];
 }
 
 absl::StatusOr<RefCountedPtr<ServiceConfig>>
-XdsResolver::XdsConfigSelector::CreateMethodConfig(
-    const XdsRouteConfigResource::Route& route,
+XdsResolver::RouteConfigData::CreateMethodConfig(
+    XdsResolver* resolver, const XdsRouteConfigResource::Route& route,
     const XdsRouteConfigResource::Route::RouteAction::ClusterWeight*
         cluster_weight) {
   std::vector<std::string> fields;
@@ -694,11 +547,11 @@ XdsResolver::XdsConfigSelector::CreateMethodConfig(
   }
   // Handle xDS HTTP filters.
   auto result = XdsRouting::GeneratePerHTTPFilterConfigs(
-      static_cast<const GrpcXdsBootstrap&>(resolver_->xds_client_->bootstrap())
+      static_cast<const GrpcXdsBootstrap&>(resolver->xds_client_->bootstrap())
           .http_filter_registry(),
-      resolver_->current_listener_.http_filters,
-      resolver_->current_virtual_host_.value(), route, cluster_weight,
-      resolver_->args_);
+      resolver->current_listener_.http_filters,
+      resolver->current_virtual_host_.value(), route, cluster_weight,
+      resolver->args_);
   if (!result.ok()) return result.status();
   for (const auto& p : result->per_filter_configs) {
     fields.emplace_back(absl::StrCat("    \"", p.first, "\": [\n",
@@ -722,6 +575,128 @@ XdsResolver::XdsConfigSelector::CreateMethodConfig(
   return nullptr;
 }
 
+absl::Status XdsResolver::RouteConfigData::AddRouteEntry(
+    const XdsRouteConfigResource::Route& route,
+    const Duration& default_max_stream_duration, XdsResolver* resolver) {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    gpr_log(GPR_INFO, "[xds_resolver %p] XdsConfigSelector %p: route: %s",
+            resolver, this, route.ToString().c_str());
+  }
+  routes_.emplace_back(route);
+  auto* route_entry = &routes_.back();
+  auto maybe_add_cluster = [&](absl::string_view cluster_name) {
+    if (clusters_.find(cluster_name) != clusters_.end()) return;
+    auto cluster_state = resolver->GetOrCreateClusterRef(cluster_name);
+    absl::string_view name = cluster_state->cluster_name();
+    clusters_.emplace(name, std::move(cluster_state));
+  };
+  auto* route_action = absl::get_if<XdsRouteConfigResource::Route::RouteAction>(
+      &route_entry->route.action);
+  if (route_action != nullptr) {
+    // If the route doesn't specify a timeout, set its timeout to the global
+    // one.
+    if (!route_action->max_stream_duration.has_value()) {
+      route_action->max_stream_duration = default_max_stream_duration;
+    }
+    absl::Status status = Match(
+        route_action->action,
+        // cluster name
+        [&](const XdsRouteConfigResource::Route::RouteAction::ClusterName&
+                cluster_name) {
+          auto result =
+              CreateMethodConfig(resolver, route_entry->route, nullptr);
+          if (!result.ok()) {
+            return result.status();
+          }
+          route_entry->method_config = std::move(*result);
+          maybe_add_cluster(
+              absl::StrCat("cluster:", cluster_name.cluster_name));
+          return absl::OkStatus();
+        },
+        // WeightedClusters
+        [&](const std::vector<
+            XdsRouteConfigResource::Route::RouteAction::ClusterWeight>&
+                weighted_clusters) {
+          uint32_t end = 0;
+          for (const auto& weighted_cluster : weighted_clusters) {
+            auto result = CreateMethodConfig(resolver, route_entry->route,
+                                             &weighted_cluster);
+            if (!result.ok()) {
+              return result.status();
+            }
+            RouteEntry::ClusterWeightState cluster_weight_state;
+            cluster_weight_state.method_config = std::move(*result);
+            end += weighted_cluster.weight;
+            cluster_weight_state.range_end = end;
+            cluster_weight_state.cluster = weighted_cluster.name;
+            route_entry->weighted_cluster_state.push_back(
+                std::move(cluster_weight_state));
+            maybe_add_cluster(absl::StrCat("cluster:", weighted_cluster.name));
+          }
+          return absl::OkStatus();
+        },
+        // ClusterSpecifierPlugin
+        [&](const XdsRouteConfigResource::Route::RouteAction::
+                ClusterSpecifierPluginName& cluster_specifier_plugin_name) {
+          auto result =
+              CreateMethodConfig(resolver, route_entry->route, nullptr);
+          if (!result.ok()) {
+            return result.status();
+          }
+          route_entry->method_config = std::move(*result);
+          maybe_add_cluster(absl::StrCat(
+              "cluster_specifier_plugin:",
+              cluster_specifier_plugin_name.cluster_specifier_plugin_name));
+          return absl::OkStatus();
+        });
+    if (!status.ok()) {
+      return status;
+    }
+  }
+  return absl::OkStatus();
+}
+
+//
+// XdsResolver::XdsConfigSelector
+//
+
+XdsResolver::XdsConfigSelector::XdsConfigSelector(
+    RefCountedPtr<XdsResolver> resolver,
+    RefCountedPtr<RouteConfigData> route_config_data)
+    : resolver_(std::move(resolver)),
+      route_config_data_(std::move(route_config_data)) {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    gpr_log(GPR_INFO, "[xds_resolver %p] creating XdsConfigSelector %p",
+            resolver_.get(), this);
+  }
+  // Populate filter list.
+  const auto& http_filter_registry =
+      static_cast<const GrpcXdsBootstrap&>(resolver_->xds_client_->bootstrap())
+          .http_filter_registry();
+  for (const auto& http_filter : resolver_->current_listener_.http_filters) {
+    // Find filter.  This is guaranteed to succeed, because it's checked
+    // at config validation time in the XdsApi code.
+    const XdsHttpFilterImpl* filter_impl =
+        http_filter_registry.GetFilterForType(
+            http_filter.config.config_proto_type_name);
+    GPR_ASSERT(filter_impl != nullptr);
+    // Add C-core filter to list.
+    if (filter_impl->channel_filter() != nullptr) {
+      filters_.push_back(filter_impl->channel_filter());
+    }
+  }
+  filters_.push_back(&ClusterSelectionFilter::kFilter);
+}
+
+XdsResolver::XdsConfigSelector::~XdsConfigSelector() {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    gpr_log(GPR_INFO, "[xds_resolver %p] destroying XdsConfigSelector %p",
+            resolver_.get(), this);
+  }
+  route_config_data_.reset();
+  resolver_->MaybeRemoveUnusedClusters();
+}
+
 absl::optional<uint64_t> HeaderHashHelper(
     const XdsRouteConfigResource::Route::RouteAction::HashPolicy::Header&
         header_policy,
@@ -747,18 +722,16 @@ absl::Status XdsResolver::XdsConfigSelector::GetCallConfig(
     GetCallConfigArgs args) {
   Slice* path = args.initial_metadata->get_pointer(HttpPathMetadata());
   GPR_ASSERT(path != nullptr);
-  auto route_index = XdsRouting::GetRouteForRequest(
-      RouteListIterator(&route_table_), path->as_string_view(),
-      args.initial_metadata);
-  if (!route_index.has_value()) {
+  auto* entry = route_config_data_->GetRouteForRequest(path->as_string_view(),
+                                                       args.initial_metadata);
+  if (entry == nullptr) {
     return absl::UnavailableError(
         "No matching route found in xDS route config");
   }
-  auto& entry = route_table_[*route_index];
   // Found a route match
   const auto* route_action =
       absl::get_if<XdsRouteConfigResource::Route::RouteAction>(
-          &entry.route.action);
+          &entry->route.action);
   if (route_action == nullptr) {
     return absl::UnavailableError("Matching route has inappropriate action");
   }
@@ -771,24 +744,24 @@ absl::Status XdsResolver::XdsConfigSelector::GetCallConfig(
               action_cluster_name) {
         cluster_name =
             absl::StrCat("cluster:", action_cluster_name.cluster_name);
-        method_config = entry.method_config;
+        method_config = entry->method_config;
       },
       // WeightedClusters
       [&](const std::vector<
           XdsRouteConfigResource::Route::RouteAction::ClusterWeight>&
           /*weighted_clusters*/) {
         const uint32_t key = absl::Uniform<uint32_t>(
-            absl::BitGen(), 0, entry.weighted_cluster_state.back().range_end);
+            absl::BitGen(), 0, entry->weighted_cluster_state.back().range_end);
         // Find the index in weighted clusters corresponding to key.
         size_t mid = 0;
         size_t start_index = 0;
-        size_t end_index = entry.weighted_cluster_state.size() - 1;
+        size_t end_index = entry->weighted_cluster_state.size() - 1;
         size_t index = 0;
         while (end_index > start_index) {
           mid = (start_index + end_index) / 2;
-          if (entry.weighted_cluster_state[mid].range_end > key) {
+          if (entry->weighted_cluster_state[mid].range_end > key) {
             end_index = mid;
-          } else if (entry.weighted_cluster_state[mid].range_end < key) {
+          } else if (entry->weighted_cluster_state[mid].range_end < key) {
             start_index = mid + 1;
           } else {
             index = mid + 1;
@@ -796,10 +769,10 @@ absl::Status XdsResolver::XdsConfigSelector::GetCallConfig(
           }
         }
         if (index == 0) index = start_index;
-        GPR_ASSERT(entry.weighted_cluster_state[index].range_end > key);
+        GPR_ASSERT(entry->weighted_cluster_state[index].range_end > key);
         cluster_name = absl::StrCat(
-            "cluster:", entry.weighted_cluster_state[index].cluster);
-        method_config = entry.weighted_cluster_state[index].method_config;
+            "cluster:", entry->weighted_cluster_state[index].cluster);
+        method_config = entry->weighted_cluster_state[index].method_config;
       },
       // ClusterSpecifierPlugin
       [&](const XdsRouteConfigResource::Route::RouteAction::
@@ -807,9 +780,9 @@ absl::Status XdsResolver::XdsConfigSelector::GetCallConfig(
         cluster_name = absl::StrCat(
             "cluster_specifier_plugin:",
             cluster_specifier_plugin_name.cluster_specifier_plugin_name);
-        method_config = entry.method_config;
+        method_config = entry->method_config;
       });
-  auto cluster = cluster_map_->Find(cluster_name);
+  auto cluster = route_config_data_->FindClusterRef(cluster_name);
   GPR_ASSERT(cluster != nullptr);
   // Generate a hash.
   absl::optional<uint64_t> hash;
@@ -857,10 +830,85 @@ absl::Status XdsResolver::XdsConfigSelector::GetCallConfig(
   args.service_config_call_data->SetCallAttribute(
       args.arena->New<RequestHashAttribute>(hash_value));
   args.service_config_call_data->SetCallAttribute(
-      args.arena->ManagedNew<XdsClusterMapAttribute>(cluster_map_));
+      args.arena->ManagedNew<XdsRouteStateAttributeImpl>(route_config_data_,
+                                                         entry));
   return absl::OkStatus();
 }
 
+//
+// XdsResolver::XdsRouteStateAttributeImpl
+//
+
+bool XdsResolver::XdsRouteStateAttributeImpl::HasClusterForRoute(
+    absl::string_view cluster_name) const {
+  // Found a route match
+  const auto* route_action =
+      absl::get_if<XdsRouteConfigResource::Route::RouteAction>(
+          &static_cast<RouteConfigData::RouteEntry*>(route_)->route.action);
+  if (route_action == nullptr) return false;
+  return Match(
+      route_action->action,
+      [&](const XdsRouteConfigResource::Route::RouteAction::ClusterName& name) {
+        return name.cluster_name == cluster_name;
+      },
+      [&](const std::vector<
+          XdsRouteConfigResource::Route::RouteAction::ClusterWeight>&
+              clusters) {
+        for (const auto& cluster : clusters) {
+          if (cluster.name == cluster_name) {
+            return true;
+          }
+        }
+        return false;
+      },
+      [&](const XdsRouteConfigResource::Route::RouteAction::
+              ClusterSpecifierPluginName& /* name */) { return false; });
+}
+
+RefCountedPtr<XdsResolver::ClusterRef>
+XdsResolver::XdsRouteStateAttributeImpl::LockAndGetCluster(
+    absl::string_view cluster_name) {
+  if (route_config_data_ == nullptr) {
+    return nullptr;
+  }
+  auto cluster = route_config_data_->FindClusterRef(cluster_name);
+  route_config_data_.reset();
+  return cluster;
+}
+
+//
+// XdsResolver::ClusterSelectionFilter
+//
+
+const grpc_channel_filter XdsResolver::ClusterSelectionFilter::kFilter =
+    MakePromiseBasedFilter<ClusterSelectionFilter, FilterEndpoint::kClient,
+                           kFilterExaminesServerInitialMetadata>(
+        "cluster_selection_filter");
+
+ArenaPromise<ServerMetadataHandle>
+XdsResolver::ClusterSelectionFilter::MakeCallPromise(
+    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+  auto* service_config_call_data =
+      static_cast<ClientChannelServiceConfigCallData*>(
+          GetContext<grpc_call_context_element>()
+              [GRPC_CONTEXT_SERVICE_CONFIG_CALL_DATA]
+                  .value);
+  GPR_ASSERT(service_config_call_data != nullptr);
+  auto* route_state_attribute = static_cast<XdsRouteStateAttributeImpl*>(
+      service_config_call_data->GetCallAttribute<XdsRouteStateAttribute>());
+  auto* cluster_name_attribute =
+      service_config_call_data->GetCallAttribute<XdsClusterAttribute>();
+  if (route_state_attribute != nullptr && cluster_name_attribute != nullptr) {
+    auto cluster = route_state_attribute->LockAndGetCluster(
+        cluster_name_attribute->cluster());
+    if (cluster != nullptr) {
+      service_config_call_data->SetOnCommit(
+          [cluster = std::move(cluster)]() mutable { cluster.reset(); });
+    }
+  }
+  return next_promise_factory(std::move(call_args));
+}
+
 //
 // XdsResolver
 //
@@ -1016,7 +1064,6 @@ void XdsResolver::OnListenerUpdate(XdsListenerResource listener) {
       });
 }
 
-namespace {
 class VirtualHostListIterator : public XdsRouting::VirtualHostListIterator {
  public:
   explicit VirtualHostListIterator(
@@ -1033,7 +1080,6 @@ class VirtualHostListIterator : public XdsRouting::VirtualHostListIterator {
  private:
   const std::vector<XdsRouteConfigResource::VirtualHost>* virtual_hosts_;
 };
-}  // namespace
 
 void XdsResolver::OnRouteConfigUpdate(XdsRouteConfigResource rds_update) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
@@ -1100,7 +1146,7 @@ void XdsResolver::OnResourceDoesNotExist(std::string context) {
 absl::StatusOr<RefCountedPtr<ServiceConfig>>
 XdsResolver::CreateServiceConfig() {
   std::vector<std::string> clusters;
-  for (const auto& cluster : cluster_state_map_) {
+  for (const auto& cluster : cluster_ref_map_) {
     absl::string_view child_name = cluster.first;
     if (absl::ConsumePrefix(&child_name, "cluster_specifier_plugin:")) {
       clusters.push_back(absl::StrFormat(
@@ -1142,13 +1188,16 @@ void XdsResolver::GenerateResult() {
   if (!current_virtual_host_.has_value()) return;
   // First create XdsConfigSelector, which may add new entries to the cluster
   // state map, and then CreateServiceConfig for LB policies.
-  absl::Status status;
-  auto config_selector = MakeRefCounted<XdsConfigSelector>(Ref(), &status);
-  if (!status.ok()) {
+  auto route_config_data =
+      RouteConfigData::Create(this, current_virtual_host_->routes,
+                              current_listener_.http_max_stream_duration);
+  if (!route_config_data.ok()) {
     OnError("could not create ConfigSelector",
-            absl::UnavailableError(status.message()));
+            absl::UnavailableError(route_config_data.status().message()));
     return;
   }
+  auto config_selector =
+      MakeRefCounted<XdsConfigSelector>(Ref(), std::move(*route_config_data));
   Result result;
   result.addresses.emplace();
   result.service_config = CreateServiceConfig();
@@ -1169,13 +1218,13 @@ void XdsResolver::GenerateResult() {
 
 void XdsResolver::MaybeRemoveUnusedClusters() {
   bool update_needed = false;
-  for (auto it = cluster_state_map_.begin(); it != cluster_state_map_.end();) {
-    RefCountedPtr<ClusterState> cluster_state = it->second->RefIfNonZero();
+  for (auto it = cluster_ref_map_.begin(); it != cluster_ref_map_.end();) {
+    RefCountedPtr<ClusterRef> cluster_state = it->second->RefIfNonZero();
     if (cluster_state != nullptr) {
       ++it;
     } else {
       update_needed = true;
-      it = cluster_state_map_.erase(it);
+      it = cluster_ref_map_.erase(it);
     }
   }
   if (update_needed && xds_client_ != nullptr) {
@@ -1185,7 +1234,7 @@ void XdsResolver::MaybeRemoveUnusedClusters() {
 }
 
 //
-// Factory
+// XdsResolverFactory
 //
 
 class XdsResolverFactory : public ResolverFactory {
@@ -1201,13 +1250,19 @@ class XdsResolverFactory : public ResolverFactory {
     return true;
   }
 
-  std::string GetDefaultAuthority(const URI& uri) const override {
-    return GetDefaultAuthorityInternal(uri);
-  }
-
   OrphanablePtr<Resolver> CreateResolver(ResolverArgs args) const override {
     if (!IsValidUri(args.uri)) return nullptr;
-    return MakeOrphanable<XdsResolver>(std::move(args));
+    std::string authority = GetDataPlaneAuthority(args.args, args.uri);
+    return MakeOrphanable<XdsResolver>(std::move(args), std::move(authority));
+  }
+
+ private:
+  std::string GetDataPlaneAuthority(const ChannelArgs& args,
+                                    const URI& uri) const {
+    absl::optional<absl::string_view> authority =
+        args.GetString(GRPC_ARG_DEFAULT_AUTHORITY);
+    if (authority.has_value()) return URI::PercentEncodeAuthority(*authority);
+    return GetDefaultAuthority(uri);
   }
 };