grpc 1.60.0 → 1.62.0

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

@@ -16,8 +16,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/resolver/xds/xds_resolver.h"
-
 #include <stdint.h>
 #include <string.h>
 
@@ -50,9 +48,8 @@
 #include <grpc/status.h>
 #include <grpc/support/log.h>
 
-#include "src/core/ext/filters/client_channel/client_channel_internal.h"
-#include "src/core/ext/filters/client_channel/config_selector.h"
-#include "src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h"
+#include "src/core/client_channel/client_channel_internal.h"
+#include "src/core/client_channel/config_selector.h"
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"
 #include "src/core/ext/xds/xds_client_grpc.h"
@@ -82,21 +79,23 @@
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/promise/context.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
-#include "src/core/lib/resolver/resolver.h"
-#include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/resolver/resolver.h"
+#include "src/core/resolver/resolver_factory.h"
 #include "src/core/lib/resource_quota/arena.h"
-#include "src/core/lib/service_config/service_config.h"
-#include "src/core/lib/service_config/service_config_impl.h"
+#include "src/core/service_config/service_config.h"
+#include "src/core/service_config/service_config_impl.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/load_balancing/ring_hash/ring_hash.h"
+#include "src/core/resolver/xds/xds_dependency_manager.h"
+#include "src/core/resolver/xds/xds_resolver_attributes.h"
+#include "src/core/resolver/xds/xds_resolver_trace.h"
 
 namespace grpc_core {
 
-TraceFlag grpc_xds_resolver_trace(false, "xds_resolver");
-
 namespace {
 
 //
@@ -136,79 +135,22 @@ class XdsResolver : public Resolver {
   }
 
  private:
-  class ListenerWatcher : public XdsListenerResourceType::WatcherInterface {
+  class XdsWatcher : public XdsDependencyManager::Watcher {
    public:
-    explicit ListenerWatcher(RefCountedPtr<XdsResolver> resolver)
+    explicit XdsWatcher(RefCountedPtr<XdsResolver> resolver)
         : resolver_(std::move(resolver)) {}
-    void OnResourceChanged(
-        std::shared_ptr<const XdsListenerResource> listener) override {
-      RefCountedPtr<ListenerWatcher> self = Ref();
-      resolver_->work_serializer_->Run(
-          [self = std::move(self), listener = std::move(listener)]() mutable {
-            self->resolver_->OnListenerUpdate(std::move(listener));
-          },
-          DEBUG_LOCATION);
-    }
-    void OnError(absl::Status status) override {
-      RefCountedPtr<ListenerWatcher> self = Ref();
-      resolver_->work_serializer_->Run(
-          [self = std::move(self), status = std::move(status)]() mutable {
-            self->resolver_->OnError(self->resolver_->lds_resource_name_,
-                                     std::move(status));
-          },
-          DEBUG_LOCATION);
-    }
-    void OnResourceDoesNotExist() override {
-      RefCountedPtr<ListenerWatcher> self = Ref();
-      resolver_->work_serializer_->Run(
-          [self = std::move(self)]() {
-            self->resolver_->OnResourceDoesNotExist(
-                absl::StrCat(self->resolver_->lds_resource_name_,
-                             ": xDS listener resource does not exist"));
-          },
-          DEBUG_LOCATION);
-    }
-
-   private:
-    RefCountedPtr<XdsResolver> resolver_;
-  };
 
-  class RouteConfigWatcher
-      : public XdsRouteConfigResourceType::WatcherInterface {
-   public:
-    explicit RouteConfigWatcher(RefCountedPtr<XdsResolver> resolver)
-        : resolver_(std::move(resolver)) {}
-    void OnResourceChanged(
-        std::shared_ptr<const XdsRouteConfigResource> route_config) override {
-      RefCountedPtr<RouteConfigWatcher> self = Ref();
-      resolver_->work_serializer_->Run(
-          [self = std::move(self),
-           route_config = std::move(route_config)]() mutable {
-            if (self != self->resolver_->route_config_watcher_) return;
-            self->resolver_->OnRouteConfigUpdate(std::move(route_config));
-          },
-          DEBUG_LOCATION);
+    void OnUpdate(
+        RefCountedPtr<const XdsDependencyManager::XdsConfig> config) override {
+      resolver_->OnUpdate(std::move(config));
     }
-    void OnError(absl::Status status) override {
-      RefCountedPtr<RouteConfigWatcher> self = Ref();
-      resolver_->work_serializer_->Run(
-          [self = std::move(self), status = std::move(status)]() mutable {
-            if (self != self->resolver_->route_config_watcher_) return;
-            self->resolver_->OnError(self->resolver_->route_config_name_,
-                                     std::move(status));
-          },
-          DEBUG_LOCATION);
+
+    void OnError(absl::string_view context, absl::Status status) override {
+      resolver_->OnError(context, std::move(status));
     }
-    void OnResourceDoesNotExist() override {
-      RefCountedPtr<RouteConfigWatcher> self = Ref();
-      resolver_->work_serializer_->Run(
-          [self = std::move(self)]() {
-            if (self != self->resolver_->route_config_watcher_) return;
-            self->resolver_->OnResourceDoesNotExist(absl::StrCat(
-                self->resolver_->route_config_name_,
-                ": xDS route configuration resource does not exist"));
-          },
-          DEBUG_LOCATION);
+
+    void OnResourceDoesNotExist(std::string context) override {
+      resolver_->OnResourceDoesNotExist(std::move(context));
     }
 
    private:
@@ -224,8 +166,12 @@ class XdsResolver : public Resolver {
   class ClusterRef : public DualRefCounted<ClusterRef> {
    public:
     ClusterRef(RefCountedPtr<XdsResolver> resolver,
-               absl::string_view cluster_name)
-        : resolver_(std::move(resolver)), cluster_name_(cluster_name) {}
+               RefCountedPtr<XdsDependencyManager::ClusterSubscription>
+                   cluster_subscription,
+               absl::string_view cluster_key)
+        : resolver_(std::move(resolver)),
+          cluster_subscription_(std::move(cluster_subscription)),
+          cluster_key_(cluster_key) {}
 
     void Orphan() override {
       XdsResolver* resolver_ptr = resolver_.get();
@@ -234,13 +180,16 @@ class XdsResolver : public Resolver {
             resolver->MaybeRemoveUnusedClusters();
           },
           DEBUG_LOCATION);
+      cluster_subscription_.reset();
     }
 
-    const std::string& cluster_name() const { return cluster_name_; }
+    const std::string& cluster_key() const { return cluster_key_; }
 
    private:
     RefCountedPtr<XdsResolver> resolver_;
-    std::string cluster_name_;
+    RefCountedPtr<XdsDependencyManager::ClusterSubscription>
+        cluster_subscription_;
+    std::string cluster_key_;
   };
 
   // A routing data including cluster refs and routes table held by the
@@ -277,9 +226,7 @@ class XdsResolver : public Resolver {
     };
 
     static absl::StatusOr<RefCountedPtr<RouteConfigData>> Create(
-        XdsResolver* resolver,
-        const std::vector<XdsRouteConfigResource::Route>& routes,
-        const Duration& default_max_stream_duration);
+        XdsResolver* resolver, const Duration& default_max_stream_duration);
 
     bool operator==(const RouteConfigData& other) const {
       return clusters_ == other.clusters_ && routes_ == other.routes_;
@@ -311,9 +258,9 @@ class XdsResolver : public Resolver {
       return sc1->json_string() == sc2->json_string();
     }
 
-    absl::Status AddRouteEntry(const XdsRouteConfigResource::Route& route,
-                               const Duration& default_max_stream_duration,
-                               XdsResolver* resolver);
+    absl::Status AddRouteEntry(XdsResolver* resolver,
+                               const XdsRouteConfigResource::Route& route,
+                               const Duration& default_max_stream_duration);
 
     std::map<absl::string_view, RefCountedPtr<ClusterRef>> clusters_;
     std::vector<RouteEntry> routes_;
@@ -365,7 +312,8 @@ class XdsResolver : public Resolver {
     RouteConfigData::RouteEntry* route_;
   };
 
-  class ClusterSelectionFilter : public ChannelFilter {
+  class ClusterSelectionFilter
+      : public ImplementChannelFilter<ClusterSelectionFilter> {
    public:
     const static grpc_channel_filter kFilter;
 
@@ -375,8 +323,15 @@ class XdsResolver : public Resolver {
     }
 
     // Construct a promise for one call.
-    ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-        CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+    class Call {
+     public:
+      void OnClientInitialMetadata(ClientMetadata& md);
+      static const NoInterceptor OnServerInitialMetadata;
+      static const NoInterceptor OnServerTrailingMetadata;
+      static const NoInterceptor OnClientToServerMessage;
+      static const NoInterceptor OnServerToClientMessage;
+      static const NoInterceptor OnFinalize;
+    };
 
    private:
     explicit ClusterSelectionFilter(ChannelFilter::Args filter_args)
@@ -386,26 +341,31 @@ class XdsResolver : public Resolver {
   };
 
   RefCountedPtr<ClusterRef> GetOrCreateClusterRef(
-      absl::string_view cluster_name) {
-    auto it = cluster_ref_map_.find(cluster_name);
+      absl::string_view cluster_key, absl::string_view cluster_name) {
+    auto it = cluster_ref_map_.find(cluster_key);
     if (it == cluster_ref_map_.end()) {
-      auto cluster = MakeRefCounted<ClusterRef>(Ref(), cluster_name);
-      cluster_ref_map_.emplace(cluster->cluster_name(), cluster->WeakRef());
+      RefCountedPtr<XdsDependencyManager::ClusterSubscription> subscription;
+      if (!cluster_name.empty()) {
+        // The cluster ref will hold a subscription to ensure that the
+        // XdsDependencyManager stays subscribed to the CDS resource as
+        // long as the cluster ref exists.
+        subscription = dependency_mgr_->GetClusterSubscription(cluster_name);
+      }
+      auto cluster = MakeRefCounted<ClusterRef>(
+          RefAsSubclass<XdsResolver>(), std::move(subscription), cluster_key);
+      cluster_ref_map_.emplace(cluster->cluster_key(), cluster->WeakRef());
       return cluster;
     }
     return it->second->Ref();
   }
 
-  void OnListenerUpdate(std::shared_ptr<const XdsListenerResource> listener);
-  void OnRouteConfigUpdate(
-      std::shared_ptr<const XdsRouteConfigResource> rds_update);
+  void OnUpdate(RefCountedPtr<const XdsDependencyManager::XdsConfig> config);
   void OnError(absl::string_view context, absl::Status status);
   void OnResourceDoesNotExist(std::string context);
 
   absl::StatusOr<RefCountedPtr<ServiceConfig>> CreateServiceConfig();
   void GenerateResult();
   void MaybeRemoveUnusedClusters();
-  uint64_t channel_id() const { return channel_id_; }
 
   std::shared_ptr<WorkSerializer> work_serializer_;
   std::unique_ptr<ResultHandler> result_handler_;
@@ -415,20 +375,23 @@ class XdsResolver : public Resolver {
   RefCountedPtr<GrpcXdsClient> xds_client_;
   std::string lds_resource_name_;
   std::string data_plane_authority_;
-  uint64_t channel_id_;
-
-  ListenerWatcher* listener_watcher_ = nullptr;
-  std::shared_ptr<const XdsListenerResource> current_listener_;
-
-  std::string route_config_name_;
-  RouteConfigWatcher* route_config_watcher_ = nullptr;
-  std::shared_ptr<const XdsRouteConfigResource> current_route_config_;
-
-  const XdsRouteConfigResource::VirtualHost* current_virtual_host_ = nullptr;
+  const uint64_t channel_id_;
 
+  OrphanablePtr<XdsDependencyManager> dependency_mgr_;
+  RefCountedPtr<const XdsDependencyManager::XdsConfig> current_config_;
   std::map<absl::string_view, WeakRefCountedPtr<ClusterRef>> cluster_ref_map_;
 };
 
+const NoInterceptor
+    XdsResolver::ClusterSelectionFilter::Call::OnServerInitialMetadata;
+const NoInterceptor
+    XdsResolver::ClusterSelectionFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor
+    XdsResolver::ClusterSelectionFilter::Call::OnClientToServerMessage;
+const NoInterceptor
+    XdsResolver::ClusterSelectionFilter::Call::OnServerToClientMessage;
+const NoInterceptor XdsResolver::ClusterSelectionFilter::Call::OnFinalize;
+
 //
 // XdsResolver::RouteConfigData::RouteListIterator
 //
@@ -458,19 +421,17 @@ class XdsResolver::RouteConfigData::RouteListIterator
 
 absl::StatusOr<RefCountedPtr<XdsResolver::RouteConfigData>>
 XdsResolver::RouteConfigData::Create(
-    XdsResolver* resolver,
-    const std::vector<XdsRouteConfigResource::Route>& routes,
-    const Duration& default_max_stream_duration) {
+    XdsResolver* resolver, 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.
-  data->routes_.reserve(routes.size());
-  for (auto& route : routes) {
+  data->routes_.reserve(resolver->current_config_->virtual_host->routes.size());
+  for (auto& route : resolver->current_config_->virtual_host->routes) {
     absl::Status status =
-        data->AddRouteEntry(route, default_max_stream_duration, resolver);
+        data->AddRouteEntry(resolver, route, default_max_stream_duration);
     if (!status.ok()) {
       return status;
     }
@@ -543,12 +504,12 @@ XdsResolver::RouteConfigData::CreateMethodConfig(
   }
   // Handle xDS HTTP filters.
   const auto& hcm = absl::get<XdsListenerResource::HttpConnectionManager>(
-      resolver->current_listener_->listener);
+      resolver->current_config_->listener->listener);
   auto result = XdsRouting::GeneratePerHTTPFilterConfigs(
       static_cast<const GrpcXdsBootstrap&>(resolver->xds_client_->bootstrap())
           .http_filter_registry(),
-      hcm.http_filters, *resolver->current_virtual_host_, route, cluster_weight,
-      resolver->args_);
+      hcm.http_filters, *resolver->current_config_->virtual_host, 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",
@@ -573,19 +534,21 @@ XdsResolver::RouteConfigData::CreateMethodConfig(
 }
 
 absl::Status XdsResolver::RouteConfigData::AddRouteEntry(
-    const XdsRouteConfigResource::Route& route,
-    const Duration& default_max_stream_duration, XdsResolver* resolver) {
+    XdsResolver* resolver, const XdsRouteConfigResource::Route& route,
+    const Duration& default_max_stream_duration) {
   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 maybe_add_cluster = [&](absl::string_view cluster_key,
+                               absl::string_view cluster_name) {
+    if (clusters_.find(cluster_key) != clusters_.end()) return;
+    auto cluster_state =
+        resolver->GetOrCreateClusterRef(cluster_key, cluster_name);
+    absl::string_view key = cluster_state->cluster_key();
+    clusters_.emplace(key, std::move(cluster_state));
   };
   auto* route_action = absl::get_if<XdsRouteConfigResource::Route::RouteAction>(
       &route_entry->route.action);
@@ -606,8 +569,8 @@ absl::Status XdsResolver::RouteConfigData::AddRouteEntry(
             return result.status();
           }
           route_entry->method_config = std::move(*result);
-          maybe_add_cluster(
-              absl::StrCat("cluster:", cluster_name.cluster_name));
+          maybe_add_cluster(absl::StrCat("cluster:", cluster_name.cluster_name),
+                            cluster_name.cluster_name);
           return absl::OkStatus();
         },
         // WeightedClusters
@@ -628,7 +591,8 @@ absl::Status XdsResolver::RouteConfigData::AddRouteEntry(
             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));
+            maybe_add_cluster(absl::StrCat("cluster:", weighted_cluster.name),
+                              weighted_cluster.name);
           }
           return absl::OkStatus();
         },
@@ -641,9 +605,11 @@ absl::Status XdsResolver::RouteConfigData::AddRouteEntry(
             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));
+          maybe_add_cluster(
+              absl::StrCat(
+                  "cluster_specifier_plugin:",
+                  cluster_specifier_plugin_name.cluster_specifier_plugin_name),
+              /*subscription_name=*/"");
           return absl::OkStatus();
         });
     if (!status.ok()) {
@@ -671,7 +637,7 @@ XdsResolver::XdsConfigSelector::XdsConfigSelector(
       static_cast<const GrpcXdsBootstrap&>(resolver_->xds_client_->bootstrap())
           .http_filter_registry();
   const auto& hcm = absl::get<XdsListenerResource::HttpConnectionManager>(
-      resolver_->current_listener_->listener);
+      resolver_->current_config_->listener->listener);
   for (const auto& http_filter : hcm.http_filters) {
     // Find filter.  This is guaranteed to succeed, because it's checked
     // at config validation time in the XdsApi code.
@@ -802,7 +768,7 @@ absl::Status XdsResolver::XdsConfigSelector::GetCallConfig(
         },
         [&](const XdsRouteConfigResource::Route::RouteAction::HashPolicy::
                 ChannelId&) -> absl::optional<uint64_t> {
-          return resolver_->channel_id();
+          return resolver_->channel_id_;
         });
     if (new_hash.has_value()) {
       // Rotating the old value prevents duplicate hash rules from cancelling
@@ -828,7 +794,7 @@ absl::Status XdsResolver::XdsConfigSelector::GetCallConfig(
                                                     parsed_method_configs);
   }
   args.service_config_call_data->SetCallAttribute(
-      args.arena->New<XdsClusterAttribute>(cluster->cluster_name()));
+      args.arena->New<XdsClusterAttribute>(cluster->cluster_key()));
   args.service_config_call_data->SetCallAttribute(
       args.arena->New<RequestHashAttribute>(*hash));
   args.service_config_call_data->SetCallAttribute(
@@ -887,9 +853,8 @@ const grpc_channel_filter XdsResolver::ClusterSelectionFilter::kFilter =
                            kFilterExaminesServerInitialMetadata>(
         "cluster_selection_filter");
 
-ArenaPromise<ServerMetadataHandle>
-XdsResolver::ClusterSelectionFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+void XdsResolver::ClusterSelectionFilter::Call::OnClientInitialMetadata(
+    ClientMetadata&) {
   auto* service_config_call_data =
       static_cast<ClientChannelServiceConfigCallData*>(
           GetContext<grpc_call_context_element>()
@@ -908,7 +873,6 @@ XdsResolver::ClusterSelectionFilter::MakeCallPromise(
           [cluster = std::move(cluster)]() mutable { cluster.reset(); });
     }
   }
-  return next_promise_factory(std::move(call_args));
 }
 
 //
@@ -932,6 +896,9 @@ void XdsResolver::StartLocked() {
     return;
   }
   xds_client_ = std::move(*xds_client);
+  grpc_pollset_set_add_pollset_set(xds_client_->interested_parties(),
+                                   interested_parties_);
+  // Determine LDS resource name.
   std::string resource_name_fragment(absl::StripPrefix(uri_.path(), "/"));
   if (!uri_.authority().empty()) {
     // target_uri.authority is set case
@@ -977,13 +944,11 @@ void XdsResolver::StartLocked() {
     gpr_log(GPR_INFO, "[xds_resolver %p] Started with lds_resource_name %s.",
             this, lds_resource_name_.c_str());
   }
-  grpc_pollset_set_add_pollset_set(
-      static_cast<GrpcXdsClient*>(xds_client_.get())->interested_parties(),
-      interested_parties_);
-  auto watcher = MakeRefCounted<ListenerWatcher>(Ref());
-  listener_watcher_ = watcher.get();
-  XdsListenerResourceType::StartWatch(xds_client_.get(), lds_resource_name_,
-                                      std::move(watcher));
+  // Start watch for xDS config.
+  dependency_mgr_ = MakeOrphanable<XdsDependencyManager>(
+      xds_client_, work_serializer_,
+      std::make_unique<XdsWatcher>(RefAsSubclass<XdsResolver>()),
+      data_plane_authority_, lds_resource_name_, args_, interested_parties_);
 }
 
 void XdsResolver::ShutdownLocked() {
@@ -991,121 +956,20 @@ void XdsResolver::ShutdownLocked() {
     gpr_log(GPR_INFO, "[xds_resolver %p] shutting down", this);
   }
   if (xds_client_ != nullptr) {
-    if (listener_watcher_ != nullptr) {
-      XdsListenerResourceType::CancelWatch(
-          xds_client_.get(), lds_resource_name_, listener_watcher_,
-          /*delay_unsubscription=*/false);
-    }
-    if (route_config_watcher_ != nullptr) {
-      XdsRouteConfigResourceType::CancelWatch(
-          xds_client_.get(), route_config_name_, route_config_watcher_,
-          /*delay_unsubscription=*/false);
-    }
-    grpc_pollset_set_del_pollset_set(
-        static_cast<GrpcXdsClient*>(xds_client_.get())->interested_parties(),
-        interested_parties_);
+    dependency_mgr_.reset();
+    grpc_pollset_set_del_pollset_set(xds_client_->interested_parties(),
+                                     interested_parties_);
     xds_client_.reset(DEBUG_LOCATION, "xds resolver");
   }
 }
 
-void XdsResolver::OnListenerUpdate(
-    std::shared_ptr<const XdsListenerResource> listener) {
+void XdsResolver::OnUpdate(
+    RefCountedPtr<const XdsDependencyManager::XdsConfig> config) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
-    gpr_log(GPR_INFO, "[xds_resolver %p] received updated listener data", this);
+    gpr_log(GPR_INFO, "[xds_resolver %p] received updated xDS config", this);
   }
   if (xds_client_ == nullptr) return;
-  const auto* hcm = absl::get_if<XdsListenerResource::HttpConnectionManager>(
-      &listener->listener);
-  if (hcm == nullptr) {
-    return OnError(lds_resource_name_,
-                   absl::UnavailableError("not an API listener"));
-  }
-  current_listener_ = std::move(listener);
-  Match(
-      hcm->route_config,
-      // RDS resource name
-      [&](const std::string& rds_name) {
-        // If the RDS name changed, update the RDS watcher.
-        // Note that this will be true on the initial update, because
-        // route_config_name_ will be empty.
-        if (route_config_name_ != rds_name) {
-          // If we already had a watch (i.e., if the previous config had
-          // a different RDS name), stop the previous watch.
-          // There will be no previous watch if either (a) this is the
-          // initial resource update or (b) the previous Listener had an
-          // inlined RouteConfig.
-          if (route_config_watcher_ != nullptr) {
-            XdsRouteConfigResourceType::CancelWatch(
-                xds_client_.get(), route_config_name_, route_config_watcher_,
-                /*delay_unsubscription=*/true);
-            route_config_watcher_ = nullptr;
-          }
-          // Start watch for the new RDS resource name.
-          route_config_name_ = rds_name;
-          auto watcher = MakeRefCounted<RouteConfigWatcher>(Ref());
-          route_config_watcher_ = watcher.get();
-          XdsRouteConfigResourceType::StartWatch(
-              xds_client_.get(), route_config_name_, std::move(watcher));
-        } else {
-          // RDS resource name has not changed, so no watch needs to be
-          // updated, but we still need to propagate any changes in the
-          // HCM config (e.g., the list of HTTP filters).
-          GenerateResult();
-        }
-      },
-      // inlined RouteConfig
-      [&](const std::shared_ptr<const XdsRouteConfigResource>& route_config) {
-        // If the previous update specified an RDS resource instead of
-        // having an inlined RouteConfig, we need to cancel the RDS watch.
-        if (route_config_watcher_ != nullptr) {
-          XdsRouteConfigResourceType::CancelWatch(
-              xds_client_.get(), route_config_name_, route_config_watcher_);
-          route_config_watcher_ = nullptr;
-          route_config_name_.clear();
-        }
-        OnRouteConfigUpdate(route_config);
-      });
-}
-
-class VirtualHostListIterator : public XdsRouting::VirtualHostListIterator {
- public:
-  explicit VirtualHostListIterator(
-      const std::vector<XdsRouteConfigResource::VirtualHost>* virtual_hosts)
-      : virtual_hosts_(virtual_hosts) {}
-
-  size_t Size() const override { return virtual_hosts_->size(); }
-
-  const std::vector<std::string>& GetDomainsForVirtualHost(
-      size_t index) const override {
-    return (*virtual_hosts_)[index].domains;
-  }
-
- private:
-  const std::vector<XdsRouteConfigResource::VirtualHost>* virtual_hosts_;
-};
-
-void XdsResolver::OnRouteConfigUpdate(
-    std::shared_ptr<const XdsRouteConfigResource> rds_update) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
-    gpr_log(GPR_INFO, "[xds_resolver %p] received updated route config", this);
-  }
-  if (xds_client_ == nullptr) return;
-  // Find the relevant VirtualHost from the RouteConfiguration.
-  auto vhost_index = XdsRouting::FindVirtualHostForDomain(
-      VirtualHostListIterator(&rds_update->virtual_hosts),
-      data_plane_authority_);
-  if (!vhost_index.has_value()) {
-    OnError(
-        route_config_name_.empty() ? lds_resource_name_ : route_config_name_,
-        absl::UnavailableError(absl::StrCat("could not find VirtualHost for ",
-                                            data_plane_authority_,
-                                            " in RouteConfiguration")));
-    return;
-  }
-  // Save the virtual host in the resolver.
-  current_route_config_ = std::move(rds_update);
-  current_virtual_host_ = &current_route_config_->virtual_hosts[*vhost_index];
-  // Send a new result to the channel.
+  current_config_ = std::move(config);
   GenerateResult();
 }
 
@@ -1118,11 +982,8 @@ void XdsResolver::OnError(absl::string_view context, absl::Status status) {
   Result result;
   result.addresses = status;
   result.service_config = std::move(status);
-  // Need to explicitly convert to the right RefCountedPtr<> type for
-  // use with ChannelArgs::SetObject().
-  RefCountedPtr<GrpcXdsClient> xds_client =
-      xds_client_->Ref(DEBUG_LOCATION, "xds resolver result");
-  result.args = args_.SetObject(std::move(xds_client));
+  result.args =
+      args_.SetObject(xds_client_.Ref(DEBUG_LOCATION, "xds resolver result"));
   result_handler_->ReportResult(std::move(result));
 }
 
@@ -1132,7 +993,7 @@ void XdsResolver::OnResourceDoesNotExist(std::string context) {
           "update and returning empty service config",
           this);
   if (xds_client_ == nullptr) return;
-  current_virtual_host_ = nullptr;
+  current_config_.reset();
   Result result;
   result.addresses.emplace();
   result.service_config = ServiceConfigImpl::Create(args_, "{}");
@@ -1153,7 +1014,7 @@ XdsResolver::CreateServiceConfig() {
           "        \"childPolicy\": %s\n"
           "       }",
           cluster.first,
-          current_route_config_->cluster_specifier_plugin_map.at(
+          current_config_->route_config->cluster_specifier_plugin_map.at(
               std::string(child_name))));
     } else {
       absl::ConsumePrefix(&child_name, "cluster:");
@@ -1185,20 +1046,21 @@ XdsResolver::CreateServiceConfig() {
 }
 
 void XdsResolver::GenerateResult() {
-  if (current_virtual_host_ == nullptr) return;
+  if (xds_client_ == nullptr || current_config_ == nullptr) return;
   // First create XdsConfigSelector, which may add new entries to the cluster
-  // state map, and then CreateServiceConfig for LB policies.
+  // state map.
   const auto& hcm = absl::get<XdsListenerResource::HttpConnectionManager>(
-      current_listener_->listener);
-  auto route_config_data = RouteConfigData::Create(
-      this, current_virtual_host_->routes, hcm.http_max_stream_duration);
+      current_config_->listener->listener);
+  auto route_config_data =
+      RouteConfigData::Create(this, hcm.http_max_stream_duration);
   if (!route_config_data.ok()) {
     OnError("could not create ConfigSelector",
             absl::UnavailableError(route_config_data.status().message()));
     return;
   }
-  auto config_selector =
-      MakeRefCounted<XdsConfigSelector>(Ref(), std::move(*route_config_data));
+  auto config_selector = MakeRefCounted<XdsConfigSelector>(
+      RefAsSubclass<XdsResolver>(), std::move(*route_config_data));
+  // Now create the service config.
   Result result;
   result.addresses.emplace();
   result.service_config = CreateServiceConfig();
@@ -1208,12 +1070,11 @@ void XdsResolver::GenerateResult() {
                 ? std::string((*result.service_config)->json_string()).c_str()
                 : result.service_config.status().ToString().c_str());
   }
-  // Need to explicitly convert to the right RefCountedPtr<> type for
-  // use with ChannelArgs::SetObject().
-  RefCountedPtr<GrpcXdsClient> xds_client =
-      xds_client_->Ref(DEBUG_LOCATION, "xds resolver result");
   result.args =
-      args_.SetObject(std::move(xds_client)).SetObject(config_selector);
+      args_.SetObject(xds_client_.Ref(DEBUG_LOCATION, "xds resolver result"))
+          .SetObject(config_selector)
+          .SetObject(current_config_)
+          .SetObject(dependency_mgr_->Ref());
   result_handler_->ReportResult(std::move(result));
 }
 
@@ -1228,10 +1089,7 @@ void XdsResolver::MaybeRemoveUnusedClusters() {
       it = cluster_ref_map_.erase(it);
     }
   }
-  if (update_needed && xds_client_ != nullptr) {
-    // Send a new result to the channel.
-    GenerateResult();
-  }
+  if (update_needed) GenerateResult();
 }
 
 //