grpc 1.56.0 → 1.61.0

data/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc

@@ -32,6 +32,7 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
+#include "absl/meta/type_traits.h"
 #include "absl/random/random.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -39,19 +40,24 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "absl/types/variant.h"
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/log.h>
 
 #include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h"
+#include "src/core/ext/filters/client_channel/lb_policy/endpoint_list.h"
 #include "src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h"
 #include "src/core/ext/filters/client_channel/lb_policy/subchannel_list.h"
 #include "src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/debug/stats.h"
+#include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/debug/trace.h"
+#include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted.h"
@@ -68,6 +74,7 @@
 #include "src/core/lib/load_balancing/lb_policy.h"
 #include "src/core/lib/load_balancing/lb_policy_factory.h"
 #include "src/core/lib/load_balancing/subchannel_interface.h"
+#include "src/core/lib/resolver/endpoint_addresses.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/transport/connectivity_state.h"
 
@@ -140,10 +147,10 @@ class WeightedRoundRobinConfig : public LoadBalancingPolicy::Config {
   float error_utilization_penalty_ = 1.0;
 };
 
-// WRR LB policy.
-class WeightedRoundRobin : public LoadBalancingPolicy {
+// Legacy WRR LB policy (not delegating to pick_first)
+class OldWeightedRoundRobin : public LoadBalancingPolicy {
  public:
-  explicit WeightedRoundRobin(Args args);
+  explicit OldWeightedRoundRobin(Args args);
 
   absl::string_view name() const override { return kWeightedRoundRobin; }
 
@@ -154,7 +161,7 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
   // Represents the weight for a given address.
   class AddressWeight : public RefCounted<AddressWeight> {
    public:
-    AddressWeight(RefCountedPtr<WeightedRoundRobin> wrr, std::string key)
+    AddressWeight(RefCountedPtr<OldWeightedRoundRobin> wrr, std::string key)
         : wrr_(std::move(wrr)), key_(std::move(key)) {}
     ~AddressWeight() override;
 
@@ -167,7 +174,7 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
     void ResetNonEmptySince();
 
    private:
-    RefCountedPtr<WeightedRoundRobin> wrr_;
+    RefCountedPtr<OldWeightedRoundRobin> wrr_;
     const std::string key_;
 
     Mutex mu_;
@@ -239,15 +246,14 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
       : public SubchannelList<WeightedRoundRobinSubchannelList,
                               WeightedRoundRobinSubchannelData> {
    public:
-    WeightedRoundRobinSubchannelList(WeightedRoundRobin* policy,
-                                     ServerAddressList addresses,
+    WeightedRoundRobinSubchannelList(OldWeightedRoundRobin* policy,
+                                     EndpointAddressesIterator* addresses,
                                      const ChannelArgs& args)
         : SubchannelList(policy,
                          (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)
                               ? "WeightedRoundRobinSubchannelList"
                               : nullptr),
-                         std::move(addresses), policy->channel_control_helper(),
-                         args) {
+                         addresses, policy->channel_control_helper(), args) {
       // Need to maintain a ref to the LB policy as long as we maintain
       // any references to subchannels, since the subchannels'
       // pollset_sets will include the LB policy's pollset_set.
@@ -255,7 +261,7 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
     }
 
     ~WeightedRoundRobinSubchannelList() override {
-      WeightedRoundRobin* p = static_cast<WeightedRoundRobin*>(policy());
+      OldWeightedRoundRobin* p = static_cast<OldWeightedRoundRobin*>(policy());
       p->Unref(DEBUG_LOCATION, "subchannel_list");
     }
 
@@ -273,7 +279,7 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
 
    private:
     std::shared_ptr<WorkSerializer> work_serializer() const override {
-      return static_cast<WeightedRoundRobin*>(policy())->work_serializer();
+      return static_cast<OldWeightedRoundRobin*>(policy())->work_serializer();
     }
 
     std::string CountersString() const {
@@ -294,7 +300,7 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
   // endpoint-reported utilization and QPS.
   class Picker : public SubchannelPicker {
    public:
-    Picker(RefCountedPtr<WeightedRoundRobin> wrr,
+    Picker(RefCountedPtr<OldWeightedRoundRobin> wrr,
            WeightedRoundRobinSubchannelList* subchannel_list);
 
     ~Picker() override;
@@ -339,7 +345,7 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
     void BuildSchedulerAndStartTimerLocked()
         ABSL_EXCLUSIVE_LOCKS_REQUIRED(&timer_mu_);
 
-    RefCountedPtr<WeightedRoundRobin> wrr_;
+    RefCountedPtr<OldWeightedRoundRobin> wrr_;
     RefCountedPtr<WeightedRoundRobinConfig> config_;
     std::vector<SubchannelInfo> subchannels_;
 
@@ -355,7 +361,7 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
     std::atomic<size_t> last_picked_index_;
   };
 
-  ~WeightedRoundRobin() override;
+  ~OldWeightedRoundRobin() override;
 
   void ShutdownLocked() override;
 
@@ -386,10 +392,10 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
 };
 
 //
-// WeightedRoundRobin::AddressWeight
+// OldWeightedRoundRobin::AddressWeight
 //
 
-WeightedRoundRobin::AddressWeight::~AddressWeight() {
+OldWeightedRoundRobin::AddressWeight::~AddressWeight() {
   MutexLock lock(&wrr_->address_weight_map_mu_);
   auto it = wrr_->address_weight_map_.find(key_);
   if (it != wrr_->address_weight_map_.end() && it->second == this) {
@@ -397,7 +403,7 @@ WeightedRoundRobin::AddressWeight::~AddressWeight() {
   }
 }
 
-void WeightedRoundRobin::AddressWeight::MaybeUpdateWeight(
+void OldWeightedRoundRobin::AddressWeight::MaybeUpdateWeight(
     double qps, double eps, double utilization,
     float error_utilization_penalty) {
   // Compute weight.
@@ -437,7 +443,7 @@ void WeightedRoundRobin::AddressWeight::MaybeUpdateWeight(
   last_update_time_ = now;
 }
 
-float WeightedRoundRobin::AddressWeight::GetWeight(
+float OldWeightedRoundRobin::AddressWeight::GetWeight(
     Timestamp now, Duration weight_expiration_period,
     Duration blackout_period) {
   MutexLock lock(&mu_);
@@ -468,16 +474,16 @@ float WeightedRoundRobin::AddressWeight::GetWeight(
   return weight_;
 }
 
-void WeightedRoundRobin::AddressWeight::ResetNonEmptySince() {
+void OldWeightedRoundRobin::AddressWeight::ResetNonEmptySince() {
   MutexLock lock(&mu_);
   non_empty_since_ = Timestamp::InfFuture();
 }
 
 //
-// WeightedRoundRobin::Picker::SubchannelCallTracker
+// OldWeightedRoundRobin::Picker::SubchannelCallTracker
 //
 
-void WeightedRoundRobin::Picker::SubchannelCallTracker::Finish(
+void OldWeightedRoundRobin::Picker::SubchannelCallTracker::Finish(
     FinishArgs args) {
   auto* backend_metric_data =
       args.backend_metric_accessor->GetBackendMetricData();
@@ -496,11 +502,11 @@ void WeightedRoundRobin::Picker::SubchannelCallTracker::Finish(
 }
 
 //
-// WeightedRoundRobin::Picker
+// OldWeightedRoundRobin::Picker
 //
 
-WeightedRoundRobin::Picker::Picker(
-    RefCountedPtr<WeightedRoundRobin> wrr,
+OldWeightedRoundRobin::Picker::Picker(
+    RefCountedPtr<OldWeightedRoundRobin> wrr,
     WeightedRoundRobinSubchannelList* subchannel_list)
     : wrr_(std::move(wrr)),
       config_(wrr_->config_),
@@ -511,6 +517,9 @@ WeightedRoundRobin::Picker::Picker(
       subchannels_.emplace_back(sd->subchannel()->Ref(), sd->weight());
     }
   }
+  global_stats().IncrementWrrSubchannelListSize(
+      subchannel_list->num_subchannels());
+  global_stats().IncrementWrrSubchannelReadySize(subchannels_.size());
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
     gpr_log(GPR_INFO,
             "[WRR %p picker %p] created picker from subchannel_list=%p "
@@ -520,13 +529,13 @@ WeightedRoundRobin::Picker::Picker(
   BuildSchedulerAndStartTimerLocked();
 }
 
-WeightedRoundRobin::Picker::~Picker() {
+OldWeightedRoundRobin::Picker::~Picker() {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
     gpr_log(GPR_INFO, "[WRR %p picker %p] destroying picker", wrr_.get(), this);
   }
 }
 
-void WeightedRoundRobin::Picker::Orphan() {
+void OldWeightedRoundRobin::Picker::Orphan() {
   MutexLock lock(&timer_mu_);
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
     gpr_log(GPR_INFO, "[WRR %p picker %p] cancelling timer", wrr_.get(), this);
@@ -535,7 +544,7 @@ void WeightedRoundRobin::Picker::Orphan() {
   timer_handle_.reset();
 }
 
-WeightedRoundRobin::PickResult WeightedRoundRobin::Picker::Pick(
+OldWeightedRoundRobin::PickResult OldWeightedRoundRobin::Picker::Pick(
     PickArgs /*args*/) {
   size_t index = PickIndex();
   GPR_ASSERT(index < subchannels_.size());
@@ -555,7 +564,7 @@ WeightedRoundRobin::PickResult WeightedRoundRobin::Picker::Pick(
                               std::move(subchannel_call_tracker));
 }
 
-size_t WeightedRoundRobin::Picker::PickIndex() {
+size_t OldWeightedRoundRobin::Picker::PickIndex() {
   // Grab a ref to the scheduler.
   std::shared_ptr<StaticStrideScheduler> scheduler;
   {
@@ -569,7 +578,7 @@ size_t WeightedRoundRobin::Picker::PickIndex() {
   return last_picked_index_.fetch_add(1) % subchannels_.size();
 }
 
-void WeightedRoundRobin::Picker::BuildSchedulerAndStartTimerLocked() {
+void OldWeightedRoundRobin::Picker::BuildSchedulerAndStartTimerLocked() {
   // Build scheduler.
   const Timestamp now = Timestamp::Now();
   std::vector<float> weights;
@@ -601,9 +610,10 @@ void WeightedRoundRobin::Picker::BuildSchedulerAndStartTimerLocked() {
     scheduler_ = std::move(scheduler);
   }
   // Start timer.
-  WeakRefCountedPtr<Picker> self = WeakRef();
   timer_handle_ = wrr_->channel_control_helper()->GetEventEngine()->RunAfter(
-      config_->weight_update_period(), [self = std::move(self)]() mutable {
+      config_->weight_update_period(),
+      [self = WeakRefAsSubclass<Picker>(),
+       work_serializer = wrr_->work_serializer()]() mutable {
         ApplicationCallbackExecCtx callback_exec_ctx;
         ExecCtx exec_ctx;
         {
@@ -616,7 +626,11 @@ void WeightedRoundRobin::Picker::BuildSchedulerAndStartTimerLocked() {
             self->BuildSchedulerAndStartTimerLocked();
           }
         }
-        // Release ref before ExecCtx goes out of scope.
+        if (!IsWorkSerializerDispatchEnabled()) {
+          // Release the picker ref inside the WorkSerializer.
+          work_serializer->Run([self = std::move(self)]() {}, DEBUG_LOCATION);
+          return;
+        }
         self.reset();
       });
 }
@@ -625,14 +639,14 @@ void WeightedRoundRobin::Picker::BuildSchedulerAndStartTimerLocked() {
 // WeightedRoundRobin
 //
 
-WeightedRoundRobin::WeightedRoundRobin(Args args)
+OldWeightedRoundRobin::OldWeightedRoundRobin(Args args)
     : LoadBalancingPolicy(std::move(args)) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
     gpr_log(GPR_INFO, "[WRR %p] Created", this);
   }
 }
 
-WeightedRoundRobin::~WeightedRoundRobin() {
+OldWeightedRoundRobin::~OldWeightedRoundRobin() {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
     gpr_log(GPR_INFO, "[WRR %p] Destroying Round Robin policy", this);
   }
@@ -640,7 +654,7 @@ WeightedRoundRobin::~WeightedRoundRobin() {
   GPR_ASSERT(latest_pending_subchannel_list_ == nullptr);
 }
 
-void WeightedRoundRobin::ShutdownLocked() {
+void OldWeightedRoundRobin::ShutdownLocked() {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
     gpr_log(GPR_INFO, "[WRR %p] Shutting down", this);
   }
@@ -649,20 +663,20 @@ void WeightedRoundRobin::ShutdownLocked() {
   latest_pending_subchannel_list_.reset();
 }
 
-void WeightedRoundRobin::ResetBackoffLocked() {
+void OldWeightedRoundRobin::ResetBackoffLocked() {
   subchannel_list_->ResetBackoffLocked();
   if (latest_pending_subchannel_list_ != nullptr) {
     latest_pending_subchannel_list_->ResetBackoffLocked();
   }
 }
 
-absl::Status WeightedRoundRobin::UpdateLocked(UpdateArgs args) {
-  config_ = std::move(args.config);
-  ServerAddressList addresses;
+absl::Status OldWeightedRoundRobin::UpdateLocked(UpdateArgs args) {
+  global_stats().IncrementWrrUpdates();
+  config_ = args.config.TakeAsSubclass<WeightedRoundRobinConfig>();
+  std::shared_ptr<EndpointAddressesIterator> addresses;
   if (args.addresses.ok()) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
-      gpr_log(GPR_INFO, "[WRR %p] received update with %" PRIuPTR " addresses",
-              this, args.addresses->size());
+      gpr_log(GPR_INFO, "[WRR %p] received update", this);
     }
     // Weed out duplicate addresses.  Also sort the addresses so that if
     // the set of the addresses don't change, their indexes in the
@@ -681,10 +695,12 @@ absl::Status WeightedRoundRobin::UpdateLocked(UpdateArgs args) {
         return memcmp(addr1.addr, addr2.addr, addr1.len) < 0;
       }
     };
-    std::set<ServerAddress, AddressLessThan> ordered_addresses(
-        args.addresses->begin(), args.addresses->end());
-    addresses =
-        ServerAddressList(ordered_addresses.begin(), ordered_addresses.end());
+    std::set<ServerAddress, AddressLessThan> ordered_addresses;
+    (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
+      ordered_addresses.insert(endpoint);
+    });
+    addresses = std::make_shared<EndpointAddressesListIterator>(
+        ServerAddressList(ordered_addresses.begin(), ordered_addresses.end()));
   } else {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
       gpr_log(GPR_INFO, "[WRR %p] received update with address error: %s", this,
@@ -701,9 +717,9 @@ absl::Status WeightedRoundRobin::UpdateLocked(UpdateArgs args) {
             this, latest_pending_subchannel_list_.get());
   }
   latest_pending_subchannel_list_ =
-      MakeRefCounted<WeightedRoundRobinSubchannelList>(
-          this, std::move(addresses), args.args);
-  latest_pending_subchannel_list_->StartWatchingLocked();
+      MakeRefCounted<WeightedRoundRobinSubchannelList>(this, addresses.get(),
+                                                       args.args);
+  latest_pending_subchannel_list_->StartWatchingLocked(args.args);
   // If the new list is empty, immediately promote it to
   // subchannel_list_ and report TRANSIENT_FAILURE.
   if (latest_pending_subchannel_list_->num_subchannels() == 0) {
@@ -730,8 +746,8 @@ absl::Status WeightedRoundRobin::UpdateLocked(UpdateArgs args) {
   return absl::OkStatus();
 }
 
-RefCountedPtr<WeightedRoundRobin::AddressWeight>
-WeightedRoundRobin::GetOrCreateWeight(const grpc_resolved_address& address) {
+RefCountedPtr<OldWeightedRoundRobin::AddressWeight>
+OldWeightedRoundRobin::GetOrCreateWeight(const grpc_resolved_address& address) {
   auto key = grpc_sockaddr_to_uri(&address);
   if (!key.ok()) return nullptr;
   MutexLock lock(&address_weight_map_mu_);
@@ -740,17 +756,18 @@ WeightedRoundRobin::GetOrCreateWeight(const grpc_resolved_address& address) {
     auto weight = it->second->RefIfNonZero();
     if (weight != nullptr) return weight;
   }
-  auto weight =
-      MakeRefCounted<AddressWeight>(Ref(DEBUG_LOCATION, "AddressWeight"), *key);
+  auto weight = MakeRefCounted<AddressWeight>(
+      RefAsSubclass<OldWeightedRoundRobin>(DEBUG_LOCATION, "AddressWeight"),
+      *key);
   address_weight_map_.emplace(*key, weight.get());
   return weight;
 }
 
 //
-// WeightedRoundRobin::WeightedRoundRobinSubchannelList
+// OldWeightedRoundRobin::WeightedRoundRobinSubchannelList
 //
 
-void WeightedRoundRobin::WeightedRoundRobinSubchannelList::
+void OldWeightedRoundRobin::WeightedRoundRobinSubchannelList::
     UpdateStateCountersLocked(absl::optional<grpc_connectivity_state> old_state,
                               grpc_connectivity_state new_state) {
   if (old_state.has_value()) {
@@ -776,9 +793,9 @@ void WeightedRoundRobin::WeightedRoundRobinSubchannelList::
   }
 }
 
-void WeightedRoundRobin::WeightedRoundRobinSubchannelList::
+void OldWeightedRoundRobin::WeightedRoundRobinSubchannelList::
     MaybeUpdateAggregatedConnectivityStateLocked(absl::Status status_for_tf) {
-  WeightedRoundRobin* p = static_cast<WeightedRoundRobin*>(policy());
+  OldWeightedRoundRobin* p = static_cast<OldWeightedRoundRobin*>(policy());
   // If this is latest_pending_subchannel_list_, then swap it into
   // subchannel_list_ in the following cases:
   // - subchannel_list_ has no READY subchannels.
@@ -816,7 +833,8 @@ void WeightedRoundRobin::WeightedRoundRobinSubchannelList::
     }
     p->channel_control_helper()->UpdateState(
         GRPC_CHANNEL_READY, absl::Status(),
-        MakeRefCounted<Picker>(p->Ref(), this));
+        MakeRefCounted<Picker>(p->RefAsSubclass<OldWeightedRoundRobin>(),
+                               this));
   } else if (num_connecting_ > 0) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
       gpr_log(GPR_INFO, "[WRR %p] reporting CONNECTING with subchannel list %p",
@@ -844,10 +862,10 @@ void WeightedRoundRobin::WeightedRoundRobinSubchannelList::
 }
 
 //
-// WeightedRoundRobin::WeightedRoundRobinSubchannelData::OobWatcher
+// OldWeightedRoundRobin::WeightedRoundRobinSubchannelData::OobWatcher
 //
 
-void WeightedRoundRobin::WeightedRoundRobinSubchannelData::OobWatcher::
+void OldWeightedRoundRobin::WeightedRoundRobinSubchannelData::OobWatcher::
     OnBackendMetricReport(const BackendMetricData& backend_metric_data) {
   double utilization = backend_metric_data.application_utilization;
   if (utilization <= 0) {
@@ -858,20 +876,20 @@ void WeightedRoundRobin::WeightedRoundRobinSubchannelData::OobWatcher::
 }
 
 //
-// WeightedRoundRobin::WeightedRoundRobinSubchannelData
+// OldWeightedRoundRobin::WeightedRoundRobinSubchannelData
 //
 
-WeightedRoundRobin::WeightedRoundRobinSubchannelData::
+OldWeightedRoundRobin::WeightedRoundRobinSubchannelData::
     WeightedRoundRobinSubchannelData(
         SubchannelList<WeightedRoundRobinSubchannelList,
                        WeightedRoundRobinSubchannelData>* subchannel_list,
         const ServerAddress& address, RefCountedPtr<SubchannelInterface> sc)
     : SubchannelData(subchannel_list, address, std::move(sc)),
-      weight_(static_cast<WeightedRoundRobin*>(subchannel_list->policy())
+      weight_(static_cast<OldWeightedRoundRobin*>(subchannel_list->policy())
                   ->GetOrCreateWeight(address.address())) {
   // Start OOB watch if configured.
-  WeightedRoundRobin* p =
-      static_cast<WeightedRoundRobin*>(subchannel_list->policy());
+  OldWeightedRoundRobin* p =
+      static_cast<OldWeightedRoundRobin*>(subchannel_list->policy());
   if (p->config_->enable_oob_load_report()) {
     subchannel()->AddDataWatcher(MakeOobBackendMetricWatcher(
         p->config_->oob_reporting_period(),
@@ -880,12 +898,12 @@ WeightedRoundRobin::WeightedRoundRobinSubchannelData::
   }
 }
 
-void WeightedRoundRobin::WeightedRoundRobinSubchannelData::
+void OldWeightedRoundRobin::WeightedRoundRobinSubchannelData::
     ProcessConnectivityChangeLocked(
         absl::optional<grpc_connectivity_state> old_state,
         grpc_connectivity_state new_state) {
-  WeightedRoundRobin* p =
-      static_cast<WeightedRoundRobin*>(subchannel_list()->policy());
+  OldWeightedRoundRobin* p =
+      static_cast<OldWeightedRoundRobin*>(subchannel_list()->policy());
   GPR_ASSERT(subchannel() != nullptr);
   // If this is not the initial state notification and the new state is
   // TRANSIENT_FAILURE or IDLE, re-resolve.
@@ -909,12 +927,21 @@ void WeightedRoundRobin::WeightedRoundRobinSubchannelData::
     subchannel()->RequestConnection();
   } else if (new_state == GRPC_CHANNEL_READY) {
     // If we transition back to READY state, restart the blackout period.
+    // Skip this if this is the initial notification for this
+    // subchannel (which happens whenever we get updated addresses and
+    // create a new endpoint list).  Also skip it if the previous state
+    // was READY (which should never happen in practice, but we've seen
+    // at least one bug that caused this in the outlier_detection
+    // policy, so let's be defensive here).
+    //
     // Note that we cannot guarantee that we will never receive
     // lingering callbacks for backend metric reports from the previous
     // connection after the new connection has been established, but they
     // should be masked by new backend metric reports from the new
     // connection by the time the blackout period ends.
-    weight_->ResetNonEmptySince();
+    if (old_state.has_value() && old_state != GRPC_CHANNEL_READY) {
+      weight_->ResetNonEmptySince();
+    }
   }
   // Update logical connectivity state.
   UpdateLogicalConnectivityStateLocked(new_state);
@@ -923,11 +950,11 @@ void WeightedRoundRobin::WeightedRoundRobinSubchannelData::
       connectivity_status());
 }
 
-void WeightedRoundRobin::WeightedRoundRobinSubchannelData::
+void OldWeightedRoundRobin::WeightedRoundRobinSubchannelData::
     UpdateLogicalConnectivityStateLocked(
         grpc_connectivity_state connectivity_state) {
-  WeightedRoundRobin* p =
-      static_cast<WeightedRoundRobin*>(subchannel_list()->policy());
+  OldWeightedRoundRobin* p =
+      static_cast<OldWeightedRoundRobin*>(subchannel_list()->policy());
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
     gpr_log(
         GPR_INFO,
@@ -971,14 +998,804 @@ void WeightedRoundRobin::WeightedRoundRobinSubchannelData::
   logical_connectivity_state_ = connectivity_state;
 }
 
+// New WRR LB policy (with delegation to pick_first)
+class WeightedRoundRobin : public LoadBalancingPolicy {
+ public:
+  explicit WeightedRoundRobin(Args args);
+
+  absl::string_view name() const override { return kWeightedRoundRobin; }
+
+  absl::Status UpdateLocked(UpdateArgs args) override;
+  void ResetBackoffLocked() override;
+
+ private:
+  // Represents the weight for a given address.
+  class EndpointWeight : public RefCounted<EndpointWeight> {
+   public:
+    EndpointWeight(RefCountedPtr<WeightedRoundRobin> wrr,
+                   EndpointAddressSet key)
+        : wrr_(std::move(wrr)), key_(std::move(key)) {}
+    ~EndpointWeight() override;
+
+    void MaybeUpdateWeight(double qps, double eps, double utilization,
+                           float error_utilization_penalty);
+
+    float GetWeight(Timestamp now, Duration weight_expiration_period,
+                    Duration blackout_period);
+
+    void ResetNonEmptySince();
+
+   private:
+    RefCountedPtr<WeightedRoundRobin> wrr_;
+    const EndpointAddressSet key_;
+
+    Mutex mu_;
+    float weight_ ABSL_GUARDED_BY(&mu_) = 0;
+    Timestamp non_empty_since_ ABSL_GUARDED_BY(&mu_) = Timestamp::InfFuture();
+    Timestamp last_update_time_ ABSL_GUARDED_BY(&mu_) = Timestamp::InfPast();
+  };
+
+  class WrrEndpointList : public EndpointList {
+   public:
+    class WrrEndpoint : public Endpoint {
+     public:
+      WrrEndpoint(RefCountedPtr<EndpointList> endpoint_list,
+                  const EndpointAddresses& addresses, const ChannelArgs& args,
+                  std::shared_ptr<WorkSerializer> work_serializer)
+          : Endpoint(std::move(endpoint_list)),
+            weight_(policy<WeightedRoundRobin>()->GetOrCreateWeight(
+                addresses.addresses())) {
+        Init(addresses, args, std::move(work_serializer));
+      }
+
+      RefCountedPtr<EndpointWeight> weight() const { return weight_; }
+
+     private:
+      class OobWatcher : public OobBackendMetricWatcher {
+       public:
+        OobWatcher(RefCountedPtr<EndpointWeight> weight,
+                   float error_utilization_penalty)
+            : weight_(std::move(weight)),
+              error_utilization_penalty_(error_utilization_penalty) {}
+
+        void OnBackendMetricReport(
+            const BackendMetricData& backend_metric_data) override;
+
+       private:
+        RefCountedPtr<EndpointWeight> weight_;
+        const float error_utilization_penalty_;
+      };
+
+      RefCountedPtr<SubchannelInterface> CreateSubchannel(
+          const grpc_resolved_address& address,
+          const ChannelArgs& per_address_args,
+          const ChannelArgs& args) override;
+
+      // Called when the child policy reports a connectivity state update.
+      void OnStateUpdate(absl::optional<grpc_connectivity_state> old_state,
+                         grpc_connectivity_state new_state,
+                         const absl::Status& status) override;
+
+      RefCountedPtr<EndpointWeight> weight_;
+    };
+
+    WrrEndpointList(RefCountedPtr<WeightedRoundRobin> wrr,
+                    EndpointAddressesIterator* endpoints,
+                    const ChannelArgs& args)
+        : EndpointList(std::move(wrr),
+                       GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)
+                           ? "WrrEndpointList"
+                           : nullptr) {
+      Init(endpoints, args,
+           [&](RefCountedPtr<EndpointList> endpoint_list,
+               const EndpointAddresses& addresses, const ChannelArgs& args) {
+             return MakeOrphanable<WrrEndpoint>(
+                 std::move(endpoint_list), addresses, args,
+                 policy<WeightedRoundRobin>()->work_serializer());
+           });
+    }
+
+   private:
+    LoadBalancingPolicy::ChannelControlHelper* channel_control_helper()
+        const override {
+      return policy<WeightedRoundRobin>()->channel_control_helper();
+    }
+
+    // Updates the counters of children in each state when a
+    // child transitions from old_state to new_state.
+    void UpdateStateCountersLocked(
+        absl::optional<grpc_connectivity_state> old_state,
+        grpc_connectivity_state new_state);
+
+    // Ensures that the right child list is used and then updates
+    // the WRR policy's connectivity state based on the child list's
+    // state counters.
+    void MaybeUpdateAggregatedConnectivityStateLocked(
+        absl::Status status_for_tf);
+
+    std::string CountersString() const {
+      return absl::StrCat("num_children=", size(), " num_ready=", num_ready_,
+                          " num_connecting=", num_connecting_,
+                          " num_transient_failure=", num_transient_failure_);
+    }
+
+    size_t num_ready_ = 0;
+    size_t num_connecting_ = 0;
+    size_t num_transient_failure_ = 0;
+
+    absl::Status last_failure_;
+  };
+
+  // A picker that performs WRR picks with weights based on
+  // endpoint-reported utilization and QPS.
+  class Picker : public SubchannelPicker {
+   public:
+    Picker(RefCountedPtr<WeightedRoundRobin> wrr,
+           WrrEndpointList* endpoint_list);
+
+    ~Picker() override;
+
+    PickResult Pick(PickArgs args) override;
+
+    void Orphan() override;
+
+   private:
+    // A call tracker that collects per-call endpoint utilization reports.
+    class SubchannelCallTracker : public SubchannelCallTrackerInterface {
+     public:
+      SubchannelCallTracker(
+          RefCountedPtr<EndpointWeight> weight, float error_utilization_penalty,
+          std::unique_ptr<SubchannelCallTrackerInterface> child_tracker)
+          : weight_(std::move(weight)),
+            error_utilization_penalty_(error_utilization_penalty),
+            child_tracker_(std::move(child_tracker)) {}
+
+      void Start() override;
+
+      void Finish(FinishArgs args) override;
+
+     private:
+      RefCountedPtr<EndpointWeight> weight_;
+      const float error_utilization_penalty_;
+      std::unique_ptr<SubchannelCallTrackerInterface> child_tracker_;
+    };
+
+    // Info stored about each endpoint.
+    struct EndpointInfo {
+      EndpointInfo(RefCountedPtr<SubchannelPicker> picker,
+                   RefCountedPtr<EndpointWeight> weight)
+          : picker(std::move(picker)), weight(std::move(weight)) {}
+
+      RefCountedPtr<SubchannelPicker> picker;
+      RefCountedPtr<EndpointWeight> weight;
+    };
+
+    // Returns the index into endpoints_ to be picked.
+    size_t PickIndex();
+
+    // Builds a new scheduler and swaps it into place, then starts a
+    // timer for the next update.
+    void BuildSchedulerAndStartTimerLocked()
+        ABSL_EXCLUSIVE_LOCKS_REQUIRED(&timer_mu_);
+
+    RefCountedPtr<WeightedRoundRobin> wrr_;
+    RefCountedPtr<WeightedRoundRobinConfig> config_;
+    std::vector<EndpointInfo> endpoints_;
+
+    Mutex scheduler_mu_;
+    std::shared_ptr<StaticStrideScheduler> scheduler_
+        ABSL_GUARDED_BY(&scheduler_mu_);
+
+    Mutex timer_mu_ ABSL_ACQUIRED_BEFORE(&scheduler_mu_);
+    absl::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
+        timer_handle_ ABSL_GUARDED_BY(&timer_mu_);
+
+    // Used when falling back to RR.
+    std::atomic<size_t> last_picked_index_;
+  };
+
+  ~WeightedRoundRobin() override;
+
+  void ShutdownLocked() override;
+
+  RefCountedPtr<EndpointWeight> GetOrCreateWeight(
+      const std::vector<grpc_resolved_address>& addresses);
+
+  RefCountedPtr<WeightedRoundRobinConfig> config_;
+
+  // List of endpoints.
+  OrphanablePtr<WrrEndpointList> endpoint_list_;
+  // Latest pending endpoint list.
+  // When we get an updated address list, we create a new endpoint list
+  // for it here, and we wait to swap it into endpoint_list_ until the new
+  // list becomes READY.
+  OrphanablePtr<WrrEndpointList> latest_pending_endpoint_list_;
+
+  Mutex endpoint_weight_map_mu_;
+  std::map<EndpointAddressSet, EndpointWeight*> endpoint_weight_map_
+      ABSL_GUARDED_BY(&endpoint_weight_map_mu_);
+
+  bool shutdown_ = false;
+
+  absl::BitGen bit_gen_;
+
+  // Accessed by picker.
+  std::atomic<uint32_t> scheduler_state_{absl::Uniform<uint32_t>(bit_gen_)};
+};
+
+//
+// WeightedRoundRobin::EndpointWeight
+//
+
+WeightedRoundRobin::EndpointWeight::~EndpointWeight() {
+  MutexLock lock(&wrr_->endpoint_weight_map_mu_);
+  auto it = wrr_->endpoint_weight_map_.find(key_);
+  if (it != wrr_->endpoint_weight_map_.end() && it->second == this) {
+    wrr_->endpoint_weight_map_.erase(it);
+  }
+}
+
+void WeightedRoundRobin::EndpointWeight::MaybeUpdateWeight(
+    double qps, double eps, double utilization,
+    float error_utilization_penalty) {
+  // Compute weight.
+  float weight = 0;
+  if (qps > 0 && utilization > 0) {
+    double penalty = 0.0;
+    if (eps > 0 && error_utilization_penalty > 0) {
+      penalty = eps / qps * error_utilization_penalty;
+    }
+    weight = qps / (utilization + penalty);
+  }
+  if (weight == 0) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+      gpr_log(GPR_INFO,
+              "[WRR %p] subchannel %s: qps=%f, eps=%f, utilization=%f: "
+              "error_util_penalty=%f, weight=%f (not updating)",
+              wrr_.get(), key_.ToString().c_str(), qps, eps, utilization,
+              error_utilization_penalty, weight);
+    }
+    return;
+  }
+  Timestamp now = Timestamp::Now();
+  // Grab the lock and update the data.
+  MutexLock lock(&mu_);
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO,
+            "[WRR %p] subchannel %s: qps=%f, eps=%f, utilization=%f "
+            "error_util_penalty=%f : setting weight=%f weight_=%f now=%s "
+            "last_update_time_=%s non_empty_since_=%s",
+            wrr_.get(), key_.ToString().c_str(), qps, eps, utilization,
+            error_utilization_penalty, weight, weight_, now.ToString().c_str(),
+            last_update_time_.ToString().c_str(),
+            non_empty_since_.ToString().c_str());
+  }
+  if (non_empty_since_ == Timestamp::InfFuture()) non_empty_since_ = now;
+  weight_ = weight;
+  last_update_time_ = now;
+}
+
+float WeightedRoundRobin::EndpointWeight::GetWeight(
+    Timestamp now, Duration weight_expiration_period,
+    Duration blackout_period) {
+  MutexLock lock(&mu_);
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO,
+            "[WRR %p] subchannel %s: getting weight: now=%s "
+            "weight_expiration_period=%s blackout_period=%s "
+            "last_update_time_=%s non_empty_since_=%s weight_=%f",
+            wrr_.get(), key_.ToString().c_str(), now.ToString().c_str(),
+            weight_expiration_period.ToString().c_str(),
+            blackout_period.ToString().c_str(),
+            last_update_time_.ToString().c_str(),
+            non_empty_since_.ToString().c_str(), weight_);
+  }
+  // If the most recent update was longer ago than the expiration
+  // period, reset non_empty_since_ so that we apply the blackout period
+  // again if we start getting data again in the future, and return 0.
+  if (now - last_update_time_ >= weight_expiration_period) {
+    non_empty_since_ = Timestamp::InfFuture();
+    return 0;
+  }
+  // If we don't have at least blackout_period worth of data, return 0.
+  if (blackout_period > Duration::Zero() &&
+      now - non_empty_since_ < blackout_period) {
+    return 0;
+  }
+  // Otherwise, return the weight.
+  return weight_;
+}
+
+void WeightedRoundRobin::EndpointWeight::ResetNonEmptySince() {
+  MutexLock lock(&mu_);
+  non_empty_since_ = Timestamp::InfFuture();
+}
+
 //
-// factory
+// WeightedRoundRobin::Picker::SubchannelCallTracker
 //
 
-class WeightedRoundRobinFactory : public LoadBalancingPolicyFactory {
- public:
-  OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
-      LoadBalancingPolicy::Args args) const override {
+void WeightedRoundRobin::Picker::SubchannelCallTracker::Start() {
+  if (child_tracker_ != nullptr) child_tracker_->Start();
+}
+
+void WeightedRoundRobin::Picker::SubchannelCallTracker::Finish(
+    FinishArgs args) {
+  if (child_tracker_ != nullptr) child_tracker_->Finish(args);
+  auto* backend_metric_data =
+      args.backend_metric_accessor->GetBackendMetricData();
+  double qps = 0;
+  double eps = 0;
+  double utilization = 0;
+  if (backend_metric_data != nullptr) {
+    qps = backend_metric_data->qps;
+    eps = backend_metric_data->eps;
+    utilization = backend_metric_data->application_utilization;
+    if (utilization <= 0) {
+      utilization = backend_metric_data->cpu_utilization;
+    }
+  }
+  weight_->MaybeUpdateWeight(qps, eps, utilization, error_utilization_penalty_);
+}
+
+//
+// WeightedRoundRobin::Picker
+//
+
+WeightedRoundRobin::Picker::Picker(RefCountedPtr<WeightedRoundRobin> wrr,
+                                   WrrEndpointList* endpoint_list)
+    : wrr_(std::move(wrr)),
+      config_(wrr_->config_),
+      last_picked_index_(absl::Uniform<size_t>(wrr_->bit_gen_)) {
+  for (auto& endpoint : endpoint_list->endpoints()) {
+    auto* ep = static_cast<WrrEndpointList::WrrEndpoint*>(endpoint.get());
+    if (ep->connectivity_state() == GRPC_CHANNEL_READY) {
+      endpoints_.emplace_back(ep->picker(), ep->weight());
+    }
+  }
+  global_stats().IncrementWrrSubchannelListSize(endpoint_list->size());
+  global_stats().IncrementWrrSubchannelReadySize(endpoints_.size());
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO,
+            "[WRR %p picker %p] created picker from endpoint_list=%p "
+            "with %" PRIuPTR " subchannels",
+            wrr_.get(), this, endpoint_list, endpoints_.size());
+  }
+  BuildSchedulerAndStartTimerLocked();
+}
+
+WeightedRoundRobin::Picker::~Picker() {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO, "[WRR %p picker %p] destroying picker", wrr_.get(), this);
+  }
+}
+
+void WeightedRoundRobin::Picker::Orphan() {
+  MutexLock lock(&timer_mu_);
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO, "[WRR %p picker %p] cancelling timer", wrr_.get(), this);
+  }
+  wrr_->channel_control_helper()->GetEventEngine()->Cancel(*timer_handle_);
+  timer_handle_.reset();
+  wrr_.reset();
+}
+
+WeightedRoundRobin::PickResult WeightedRoundRobin::Picker::Pick(PickArgs args) {
+  size_t index = PickIndex();
+  GPR_ASSERT(index < endpoints_.size());
+  auto& endpoint_info = endpoints_[index];
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO,
+            "[WRR %p picker %p] returning index %" PRIuPTR ", picker=%p",
+            wrr_.get(), this, index, endpoint_info.picker.get());
+  }
+  auto result = endpoint_info.picker->Pick(args);
+  // Collect per-call utilization data if needed.
+  if (!config_->enable_oob_load_report()) {
+    auto* complete = absl::get_if<PickResult::Complete>(&result.result);
+    if (complete != nullptr) {
+      complete->subchannel_call_tracker =
+          std::make_unique<SubchannelCallTracker>(
+              endpoint_info.weight, config_->error_utilization_penalty(),
+              std::move(complete->subchannel_call_tracker));
+    }
+  }
+  return result;
+}
+
+size_t WeightedRoundRobin::Picker::PickIndex() {
+  // Grab a ref to the scheduler.
+  std::shared_ptr<StaticStrideScheduler> scheduler;
+  {
+    MutexLock lock(&scheduler_mu_);
+    scheduler = scheduler_;
+  }
+  // If we have a scheduler, use it to do a WRR pick.
+  if (scheduler != nullptr) return scheduler->Pick();
+  // We don't have a scheduler (i.e., either all of the weights are 0 or
+  // there is only one subchannel), so fall back to RR.
+  return last_picked_index_.fetch_add(1) % endpoints_.size();
+}
+
+void WeightedRoundRobin::Picker::BuildSchedulerAndStartTimerLocked() {
+  // Build scheduler.
+  const Timestamp now = Timestamp::Now();
+  std::vector<float> weights;
+  weights.reserve(endpoints_.size());
+  for (const auto& endpoint : endpoints_) {
+    weights.push_back(endpoint.weight->GetWeight(
+        now, config_->weight_expiration_period(), config_->blackout_period()));
+  }
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO, "[WRR %p picker %p] new weights: %s", wrr_.get(), this,
+            absl::StrJoin(weights, " ").c_str());
+  }
+  auto scheduler_or = StaticStrideScheduler::Make(
+      weights, [this]() { return wrr_->scheduler_state_.fetch_add(1); });
+  std::shared_ptr<StaticStrideScheduler> scheduler;
+  if (scheduler_or.has_value()) {
+    scheduler =
+        std::make_shared<StaticStrideScheduler>(std::move(*scheduler_or));
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+      gpr_log(GPR_INFO, "[WRR %p picker %p] new scheduler: %p", wrr_.get(),
+              this, scheduler.get());
+    }
+  } else if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO, "[WRR %p picker %p] no scheduler, falling back to RR",
+            wrr_.get(), this);
+  }
+  {
+    MutexLock lock(&scheduler_mu_);
+    scheduler_ = std::move(scheduler);
+  }
+  // Start timer.
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO, "[WRR %p picker %p] scheduling timer for %s", wrr_.get(),
+            this, config_->weight_update_period().ToString().c_str());
+  }
+  timer_handle_ = wrr_->channel_control_helper()->GetEventEngine()->RunAfter(
+      config_->weight_update_period(),
+      [self = WeakRefAsSubclass<Picker>(),
+       work_serializer = wrr_->work_serializer()]() mutable {
+        ApplicationCallbackExecCtx callback_exec_ctx;
+        ExecCtx exec_ctx;
+        {
+          MutexLock lock(&self->timer_mu_);
+          if (self->timer_handle_.has_value()) {
+            if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+              gpr_log(GPR_INFO, "[WRR %p picker %p] timer fired",
+                      self->wrr_.get(), self.get());
+            }
+            self->BuildSchedulerAndStartTimerLocked();
+          }
+        }
+        if (!IsWorkSerializerDispatchEnabled()) {
+          // Release the picker ref inside the WorkSerializer.
+          work_serializer->Run([self = std::move(self)]() {}, DEBUG_LOCATION);
+          return;
+        }
+        self.reset();
+      });
+}
+
+//
+// WeightedRoundRobin
+//
+
+WeightedRoundRobin::WeightedRoundRobin(Args args)
+    : LoadBalancingPolicy(std::move(args)) {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO, "[WRR %p] Created", this);
+  }
+}
+
+WeightedRoundRobin::~WeightedRoundRobin() {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO, "[WRR %p] Destroying Round Robin policy", this);
+  }
+  GPR_ASSERT(endpoint_list_ == nullptr);
+  GPR_ASSERT(latest_pending_endpoint_list_ == nullptr);
+}
+
+void WeightedRoundRobin::ShutdownLocked() {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO, "[WRR %p] Shutting down", this);
+  }
+  shutdown_ = true;
+  endpoint_list_.reset();
+  latest_pending_endpoint_list_.reset();
+}
+
+void WeightedRoundRobin::ResetBackoffLocked() {
+  endpoint_list_->ResetBackoffLocked();
+  if (latest_pending_endpoint_list_ != nullptr) {
+    latest_pending_endpoint_list_->ResetBackoffLocked();
+  }
+}
+
+absl::Status WeightedRoundRobin::UpdateLocked(UpdateArgs args) {
+  global_stats().IncrementWrrUpdates();
+  config_ = args.config.TakeAsSubclass<WeightedRoundRobinConfig>();
+  std::shared_ptr<EndpointAddressesIterator> addresses;
+  if (args.addresses.ok()) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+      gpr_log(GPR_INFO, "[WRR %p] received update", this);
+    }
+    // Weed out duplicate endpoints.  Also sort the endpoints so that if
+    // the set of endpoints doesn't change, their indexes in the endpoint
+    // list don't change, since this avoids unnecessary churn in the
+    // picker.  Note that this does not ensure that if a given endpoint
+    // remains present that it will have the same index; if, for example,
+    // an endpoint at the end of the list is replaced with one that sorts
+    // much earlier in the list, then all of the endpoints in between those
+    // two positions will have changed indexes.
+    struct EndpointAddressesLessThan {
+      bool operator()(const EndpointAddresses& endpoint1,
+                      const EndpointAddresses& endpoint2) const {
+        // Compare unordered addresses only, not channel args.
+        EndpointAddressSet e1(endpoint1.addresses());
+        EndpointAddressSet e2(endpoint2.addresses());
+        return e1 < e2;
+      }
+    };
+    std::set<EndpointAddresses, EndpointAddressesLessThan> ordered_addresses;
+    (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
+      ordered_addresses.insert(endpoint);
+    });
+    addresses =
+        std::make_shared<EndpointAddressesListIterator>(EndpointAddressesList(
+            ordered_addresses.begin(), ordered_addresses.end()));
+  } else {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+      gpr_log(GPR_INFO, "[WRR %p] received update with address error: %s", this,
+              args.addresses.status().ToString().c_str());
+    }
+    // If we already have an endpoint list, then keep using the existing
+    // list, but still report back that the update was not accepted.
+    if (endpoint_list_ != nullptr) return args.addresses.status();
+  }
+  // Create new endpoint list, replacing the previous pending list, if any.
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace) &&
+      latest_pending_endpoint_list_ != nullptr) {
+    gpr_log(GPR_INFO, "[WRR %p] replacing previous pending endpoint list %p",
+            this, latest_pending_endpoint_list_.get());
+  }
+  latest_pending_endpoint_list_ = MakeOrphanable<WrrEndpointList>(
+      RefAsSubclass<WeightedRoundRobin>(), addresses.get(), args.args);
+  // If the new list is empty, immediately promote it to
+  // endpoint_list_ and report TRANSIENT_FAILURE.
+  if (latest_pending_endpoint_list_->size() == 0) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace) &&
+        endpoint_list_ != nullptr) {
+      gpr_log(GPR_INFO, "[WRR %p] replacing previous endpoint list %p", this,
+              endpoint_list_.get());
+    }
+    endpoint_list_ = std::move(latest_pending_endpoint_list_);
+    absl::Status status =
+        args.addresses.ok() ? absl::UnavailableError(absl::StrCat(
+                                  "empty address list: ", args.resolution_note))
+                            : args.addresses.status();
+    channel_control_helper()->UpdateState(
+        GRPC_CHANNEL_TRANSIENT_FAILURE, status,
+        MakeRefCounted<TransientFailurePicker>(status));
+    return status;
+  }
+  // Otherwise, if this is the initial update, immediately promote it to
+  // endpoint_list_.
+  if (endpoint_list_.get() == nullptr) {
+    endpoint_list_ = std::move(latest_pending_endpoint_list_);
+  }
+  return absl::OkStatus();
+}
+
+RefCountedPtr<WeightedRoundRobin::EndpointWeight>
+WeightedRoundRobin::GetOrCreateWeight(
+    const std::vector<grpc_resolved_address>& addresses) {
+  EndpointAddressSet key(addresses);
+  MutexLock lock(&endpoint_weight_map_mu_);
+  auto it = endpoint_weight_map_.find(key);
+  if (it != endpoint_weight_map_.end()) {
+    auto weight = it->second->RefIfNonZero();
+    if (weight != nullptr) return weight;
+  }
+  auto weight = MakeRefCounted<EndpointWeight>(
+      RefAsSubclass<WeightedRoundRobin>(DEBUG_LOCATION, "EndpointWeight"), key);
+  endpoint_weight_map_.emplace(key, weight.get());
+  return weight;
+}
+
+//
+// WeightedRoundRobin::WrrEndpointList::WrrEndpoint::OobWatcher
+//
+
+void WeightedRoundRobin::WrrEndpointList::WrrEndpoint::OobWatcher::
+    OnBackendMetricReport(const BackendMetricData& backend_metric_data) {
+  double utilization = backend_metric_data.application_utilization;
+  if (utilization <= 0) {
+    utilization = backend_metric_data.cpu_utilization;
+  }
+  weight_->MaybeUpdateWeight(backend_metric_data.qps, backend_metric_data.eps,
+                             utilization, error_utilization_penalty_);
+}
+
+//
+// WeightedRoundRobin::WrrEndpointList::WrrEndpoint
+//
+
+RefCountedPtr<SubchannelInterface>
+WeightedRoundRobin::WrrEndpointList::WrrEndpoint::CreateSubchannel(
+    const grpc_resolved_address& address, const ChannelArgs& per_address_args,
+    const ChannelArgs& args) {
+  auto* wrr = policy<WeightedRoundRobin>();
+  auto subchannel = wrr->channel_control_helper()->CreateSubchannel(
+      address, per_address_args, args);
+  // Start OOB watch if configured.
+  if (wrr->config_->enable_oob_load_report()) {
+    subchannel->AddDataWatcher(MakeOobBackendMetricWatcher(
+        wrr->config_->oob_reporting_period(),
+        std::make_unique<OobWatcher>(
+            weight_, wrr->config_->error_utilization_penalty())));
+  }
+  return subchannel;
+}
+
+void WeightedRoundRobin::WrrEndpointList::WrrEndpoint::OnStateUpdate(
+    absl::optional<grpc_connectivity_state> old_state,
+    grpc_connectivity_state new_state, const absl::Status& status) {
+  auto* wrr_endpoint_list = endpoint_list<WrrEndpointList>();
+  auto* wrr = policy<WeightedRoundRobin>();
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+    gpr_log(GPR_INFO,
+            "[WRR %p] connectivity changed for child %p, endpoint_list %p "
+            "(index %" PRIuPTR " of %" PRIuPTR
+            "): prev_state=%s new_state=%s (%s)",
+            wrr, this, wrr_endpoint_list, Index(), wrr_endpoint_list->size(),
+            (old_state.has_value() ? ConnectivityStateName(*old_state) : "N/A"),
+            ConnectivityStateName(new_state), status.ToString().c_str());
+  }
+  if (new_state == GRPC_CHANNEL_IDLE) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+      gpr_log(GPR_INFO,
+              "[WRR %p] child %p reported IDLE; requesting connection", wrr,
+              this);
+    }
+    ExitIdleLocked();
+  } else if (new_state == GRPC_CHANNEL_READY) {
+    // If we transition back to READY state, restart the blackout period.
+    // Skip this if this is the initial notification for this
+    // endpoint (which happens whenever we get updated addresses and
+    // create a new endpoint list).  Also skip it if the previous state
+    // was READY (which should never happen in practice, but we've seen
+    // at least one bug that caused this in the outlier_detection
+    // policy, so let's be defensive here).
+    //
+    // Note that we cannot guarantee that we will never receive
+    // lingering callbacks for backend metric reports from the previous
+    // connection after the new connection has been established, but they
+    // should be masked by new backend metric reports from the new
+    // connection by the time the blackout period ends.
+    if (old_state.has_value() && old_state != GRPC_CHANNEL_READY) {
+      weight_->ResetNonEmptySince();
+    }
+  }
+  // If state changed, update state counters.
+  if (!old_state.has_value() || *old_state != new_state) {
+    wrr_endpoint_list->UpdateStateCountersLocked(old_state, new_state);
+  }
+  // Update the policy state.
+  wrr_endpoint_list->MaybeUpdateAggregatedConnectivityStateLocked(status);
+}
+
+//
+// WeightedRoundRobin::WrrEndpointList
+//
+
+void WeightedRoundRobin::WrrEndpointList::UpdateStateCountersLocked(
+    absl::optional<grpc_connectivity_state> old_state,
+    grpc_connectivity_state new_state) {
+  // We treat IDLE the same as CONNECTING, since it will immediately
+  // transition into that state anyway.
+  if (old_state.has_value()) {
+    GPR_ASSERT(*old_state != GRPC_CHANNEL_SHUTDOWN);
+    if (*old_state == GRPC_CHANNEL_READY) {
+      GPR_ASSERT(num_ready_ > 0);
+      --num_ready_;
+    } else if (*old_state == GRPC_CHANNEL_CONNECTING ||
+               *old_state == GRPC_CHANNEL_IDLE) {
+      GPR_ASSERT(num_connecting_ > 0);
+      --num_connecting_;
+    } else if (*old_state == GRPC_CHANNEL_TRANSIENT_FAILURE) {
+      GPR_ASSERT(num_transient_failure_ > 0);
+      --num_transient_failure_;
+    }
+  }
+  GPR_ASSERT(new_state != GRPC_CHANNEL_SHUTDOWN);
+  if (new_state == GRPC_CHANNEL_READY) {
+    ++num_ready_;
+  } else if (new_state == GRPC_CHANNEL_CONNECTING ||
+             new_state == GRPC_CHANNEL_IDLE) {
+    ++num_connecting_;
+  } else if (new_state == GRPC_CHANNEL_TRANSIENT_FAILURE) {
+    ++num_transient_failure_;
+  }
+}
+
+void WeightedRoundRobin::WrrEndpointList::
+    MaybeUpdateAggregatedConnectivityStateLocked(absl::Status status_for_tf) {
+  auto* wrr = policy<WeightedRoundRobin>();
+  // If this is latest_pending_endpoint_list_, then swap it into
+  // endpoint_list_ in the following cases:
+  // - endpoint_list_ has no READY children.
+  // - This list has at least one READY child and we have seen the
+  //   initial connectivity state notification for all children.
+  // - All of the children in this list are in TRANSIENT_FAILURE.
+  //   (This may cause the channel to go from READY to TRANSIENT_FAILURE,
+  //   but we're doing what the control plane told us to do.)
+  if (wrr->latest_pending_endpoint_list_.get() == this &&
+      (wrr->endpoint_list_->num_ready_ == 0 ||
+       (num_ready_ > 0 && AllEndpointsSeenInitialState()) ||
+       num_transient_failure_ == size())) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+      const std::string old_counters_string =
+          wrr->endpoint_list_ != nullptr ? wrr->endpoint_list_->CountersString()
+                                         : "";
+      gpr_log(GPR_INFO,
+              "[WRR %p] swapping out endpoint list %p (%s) in favor of %p (%s)",
+              wrr, wrr->endpoint_list_.get(), old_counters_string.c_str(), this,
+              CountersString().c_str());
+    }
+    wrr->endpoint_list_ = std::move(wrr->latest_pending_endpoint_list_);
+  }
+  // Only set connectivity state if this is the current endpoint list.
+  if (wrr->endpoint_list_.get() != this) return;
+  // First matching rule wins:
+  // 1) ANY child is READY => policy is READY.
+  // 2) ANY child is CONNECTING => policy is CONNECTING.
+  // 3) ALL children are TRANSIENT_FAILURE => policy is TRANSIENT_FAILURE.
+  if (num_ready_ > 0) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+      gpr_log(GPR_INFO, "[WRR %p] reporting READY with endpoint list %p", wrr,
+              this);
+    }
+    wrr->channel_control_helper()->UpdateState(
+        GRPC_CHANNEL_READY, absl::Status(),
+        MakeRefCounted<Picker>(wrr->RefAsSubclass<WeightedRoundRobin>(), this));
+  } else if (num_connecting_ > 0) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+      gpr_log(GPR_INFO, "[WRR %p] reporting CONNECTING with endpoint list %p",
+              wrr, this);
+    }
+    wrr->channel_control_helper()->UpdateState(
+        GRPC_CHANNEL_CONNECTING, absl::Status(),
+        MakeRefCounted<QueuePicker>(nullptr));
+  } else if (num_transient_failure_ == size()) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
+      gpr_log(GPR_INFO,
+              "[WRR %p] reporting TRANSIENT_FAILURE with endpoint list %p: %s",
+              wrr, this, status_for_tf.ToString().c_str());
+    }
+    if (!status_for_tf.ok()) {
+      last_failure_ = absl::UnavailableError(
+          absl::StrCat("connections to all backends failing; last error: ",
+                       status_for_tf.ToString()));
+    }
+    wrr->channel_control_helper()->UpdateState(
+        GRPC_CHANNEL_TRANSIENT_FAILURE, last_failure_,
+        MakeRefCounted<TransientFailurePicker>(last_failure_));
+  }
+}
+
+//
+// factory
+//
+
+class WeightedRoundRobinFactory : public LoadBalancingPolicyFactory {
+ public:
+  OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
+      LoadBalancingPolicy::Args args) const override {
+    if (!IsWrrDelegateToPickFirstEnabled()) {
+      return MakeOrphanable<OldWeightedRoundRobin>(std::move(args));
+    }
     return MakeOrphanable<WeightedRoundRobin>(std::move(args));
   }