grpc 1.70.1 → 1.72.0

data/src/core/load_balancing/pick_first/pick_first.cc

@@ -24,6 +24,7 @@
 #include <string.h>
 
 #include <memory>
+#include <optional>
 #include <set>
 #include <string>
 #include <type_traits>
@@ -38,7 +39,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -195,7 +195,7 @@ class PickFirst final : public LoadBalancingPolicy {
 
         // TODO(roth): Once we remove pollset_set, we should no longer
         // need to hold a ref to PickFirst.  Instead, we can make this a
-        // raw pointer and put it in an absl::variant with subchannel_data_.
+        // raw pointer and put it in an std::variant with subchannel_data_.
         RefCountedPtr<PickFirst> pick_first_;
 
         RefCountedPtr<SubchannelInterface> subchannel_;
@@ -206,7 +206,7 @@ class PickFirst final : public LoadBalancingPolicy {
       SubchannelData(SubchannelList* subchannel_list, size_t index,
                      RefCountedPtr<SubchannelInterface> subchannel);
 
-      absl::optional<grpc_connectivity_state> connectivity_state() const {
+      std::optional<grpc_connectivity_state> connectivity_state() const {
         return connectivity_state_;
       }
       const absl::Status& connectivity_status() const {
@@ -224,6 +224,7 @@ class PickFirst final : public LoadBalancingPolicy {
       void RequestConnectionWithTimer();
 
       bool seen_transient_failure() const { return seen_transient_failure_; }
+      void set_seen_transient_failure() { seen_transient_failure_ = true; }
 
      private:
       // This method will be invoked once soon after instantiation to report
@@ -239,7 +240,7 @@ class PickFirst final : public LoadBalancingPolicy {
       // Subchannel state.
       OrphanablePtr<SubchannelState> subchannel_state_;
       // Data updated by the watcher.
-      absl::optional<grpc_connectivity_state> connectivity_state_;
+      std::optional<grpc_connectivity_state> connectivity_state_;
       absl::Status connectivity_status_;
       bool seen_transient_failure_ = false;
     };
@@ -312,7 +313,7 @@ class PickFirst final : public LoadBalancingPolicy {
     // initial pass is over, this will be equal to size().
     size_t attempting_index_ = 0;
     // Happy Eyeballs timer handle.
-    absl::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
+    std::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
         timer_handle_;
 
     // After the initial Happy Eyeballs pass, the number of failures
@@ -822,13 +823,11 @@ void PickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
   // not call us in the first place.
   CHECK_NE(new_state, GRPC_CHANNEL_READY);
   // Update state.
-  absl::optional<grpc_connectivity_state> old_state = connectivity_state_;
+  std::optional<grpc_connectivity_state> old_state = connectivity_state_;
   connectivity_state_ = new_state;
   connectivity_status_ = std::move(status);
   // Make sure we note when a subchannel has seen TRANSIENT_FAILURE.
-  bool prev_seen_transient_failure = seen_transient_failure_;
   if (new_state == GRPC_CHANNEL_TRANSIENT_FAILURE) {
-    seen_transient_failure_ = true;
     subchannel_list_->last_failure_ = connectivity_status_;
   }
   // If this is the initial connectivity state update for this subchannel,
@@ -873,6 +872,8 @@ void PickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
   // Otherwise, process connectivity state change.
   switch (*connectivity_state_) {
     case GRPC_CHANNEL_TRANSIENT_FAILURE: {
+      bool prev_seen_transient_failure =
+          std::exchange(seen_transient_failure_, true);
       // If this is the first failure we've seen on this subchannel,
       // then we're still in the Happy Eyeballs pass.
       if (!prev_seen_transient_failure && seen_transient_failure_) {
@@ -957,7 +958,6 @@ void PickFirst::SubchannelList::SubchannelData::RequestConnectionWithTimer() {
             p->connection_attempt_delay_,
             [subchannel_list =
                  subchannel_list_->Ref(DEBUG_LOCATION, "timer")]() mutable {
-              ApplicationCallbackExecCtx application_exec_ctx;
               ExecCtx exec_ctx;
               auto* sl = subchannel_list.get();
               sl->policy_->work_serializer()->Run(
@@ -973,8 +973,7 @@ void PickFirst::SubchannelList::SubchannelData::RequestConnectionWithTimer() {
                     if (subchannel_list->policy_->selected_ != nullptr) return;
                     ++subchannel_list->attempting_index_;
                     subchannel_list->StartConnectingNextSubchannel();
-                  },
-                  DEBUG_LOCATION);
+                  });
             });
   }
 }
@@ -1068,6 +1067,7 @@ void PickFirst::SubchannelList::StartConnectingNextSubchannel() {
       sc->RequestConnectionWithTimer();
       return;
     }
+    sc->set_seen_transient_failure();
   }
   // If we didn't find a subchannel to request a connection on, check to
   // see if the Happy Eyeballs pass is complete.
@@ -1106,958 +1106,6 @@ void PickFirst::SubchannelList::MaybeFinishHappyEyeballsPass() {
   }
 }
 
-// TODO(roth): Remove this when the pick_first_new experiment is removed.
-class OldPickFirst final : public LoadBalancingPolicy {
- public:
-  explicit OldPickFirst(Args args);
-
-  absl::string_view name() const override { return kPickFirst; }
-
-  absl::Status UpdateLocked(UpdateArgs args) override;
-  void ExitIdleLocked() override;
-  void ResetBackoffLocked() override;
-
- private:
-  ~OldPickFirst() override;
-
-  class SubchannelList final : public InternallyRefCounted<SubchannelList> {
-   public:
-    class SubchannelData final {
-     public:
-      SubchannelData(SubchannelList* subchannel_list, size_t index,
-                     RefCountedPtr<SubchannelInterface> subchannel);
-
-      SubchannelInterface* subchannel() const { return subchannel_.get(); }
-      absl::optional<grpc_connectivity_state> connectivity_state() const {
-        return connectivity_state_;
-      }
-      const absl::Status& connectivity_status() const {
-        return connectivity_status_;
-      }
-
-      // Resets the connection backoff.
-      void ResetBackoffLocked() {
-        if (subchannel_ != nullptr) subchannel_->ResetBackoff();
-      }
-
-      void RequestConnection() { subchannel_->RequestConnection(); }
-
-      // Requests a connection attempt to start on this subchannel,
-      // with appropriate Connection Attempt Delay.
-      // Used only during the Happy Eyeballs pass.
-      void RequestConnectionWithTimer();
-
-      // Cancels any pending connectivity watch and unrefs the subchannel.
-      void ShutdownLocked();
-
-      bool seen_transient_failure() const { return seen_transient_failure_; }
-
-     private:
-      // Watcher for subchannel connectivity state.
-      class Watcher final
-          : public SubchannelInterface::ConnectivityStateWatcherInterface {
-       public:
-        Watcher(RefCountedPtr<SubchannelList> subchannel_list, size_t index)
-            : subchannel_list_(std::move(subchannel_list)), index_(index) {}
-
-        ~Watcher() override {
-          subchannel_list_.reset(DEBUG_LOCATION, "Watcher dtor");
-        }
-
-        void OnConnectivityStateChange(grpc_connectivity_state new_state,
-                                       absl::Status status) override {
-          subchannel_list_->subchannels_[index_].OnConnectivityStateChange(
-              new_state, std::move(status));
-        }
-
-        grpc_pollset_set* interested_parties() override {
-          return subchannel_list_->policy_->interested_parties();
-        }
-
-       private:
-        RefCountedPtr<SubchannelList> subchannel_list_;
-        const size_t index_;
-      };
-
-      // This method will be invoked once soon after instantiation to report
-      // the current connectivity state, and it will then be invoked again
-      // whenever the connectivity state changes.
-      void OnConnectivityStateChange(grpc_connectivity_state new_state,
-                                     absl::Status status);
-
-      // Processes the connectivity change to READY for an unselected
-      // subchannel.
-      void ProcessUnselectedReadyLocked();
-
-      // Backpointer to owning subchannel list.  Not owned.
-      SubchannelList* subchannel_list_;
-      const size_t index_;
-      // The subchannel.
-      RefCountedPtr<SubchannelInterface> subchannel_;
-      // Will be non-null when the subchannel's state is being watched.
-      SubchannelInterface::ConnectivityStateWatcherInterface* pending_watcher_ =
-          nullptr;
-      // Data updated by the watcher.
-      absl::optional<grpc_connectivity_state> connectivity_state_;
-      absl::Status connectivity_status_;
-      bool seen_transient_failure_ = false;
-    };
-
-    SubchannelList(RefCountedPtr<OldPickFirst> policy,
-                   EndpointAddressesIterator* addresses,
-                   const ChannelArgs& args, absl::string_view resolution_note);
-
-    ~SubchannelList() override;
-
-    // The number of subchannels in the list.
-    size_t size() const { return subchannels_.size(); }
-
-    // Resets connection backoff of all subchannels.
-    void ResetBackoffLocked();
-
-    void Orphan() override;
-
-    bool IsHappyEyeballsPassComplete() const {
-      // Checking attempting_index_ here is just an optimization -- if
-      // we haven't actually tried all subchannels yet, then we don't
-      // need to iterate.
-      if (attempting_index_ < size()) return false;
-      for (const SubchannelData& sd : subchannels_) {
-        if (!sd.seen_transient_failure()) return false;
-      }
-      return true;
-    }
-
-    void ReportTransientFailure(absl::Status status);
-
-   private:
-    // Returns true if all subchannels have seen their initial
-    // connectivity state notifications.
-    bool AllSubchannelsSeenInitialState() const {
-      return num_subchannels_seen_initial_notification_ == size();
-    }
-
-    // Looks through subchannels_ starting from attempting_index_ to
-    // find the first one not currently in TRANSIENT_FAILURE, then
-    // triggers a connection attempt for that subchannel.  If there are
-    // no more subchannels not in TRANSIENT_FAILURE, calls
-    // MaybeFinishHappyEyeballsPass().
-    void StartConnectingNextSubchannel();
-
-    // Checks to see if the initial Happy Eyeballs pass is complete --
-    // i.e., all subchannels have seen TRANSIENT_FAILURE state at least once.
-    // If so, transitions to a mode where we try to connect to all subchannels
-    // in parallel and returns true.
-    void MaybeFinishHappyEyeballsPass();
-
-    // Backpointer to owning policy.
-    RefCountedPtr<OldPickFirst> policy_;
-
-    ChannelArgs args_;
-    std::string resolution_note_;
-
-    // The list of subchannels.
-    std::vector<SubchannelData> subchannels_;
-
-    // Is this list shutting down? This may be true due to the shutdown of the
-    // policy itself or because a newer update has arrived while this one hadn't
-    // finished processing.
-    bool shutting_down_ = false;
-
-    size_t num_subchannels_seen_initial_notification_ = 0;
-
-    // The index into subchannels_ to which we are currently attempting
-    // to connect during the initial Happy Eyeballs pass.  Once the
-    // initial pass is over, this will be equal to size().
-    size_t attempting_index_ = 0;
-    // Happy Eyeballs timer handle.
-    absl::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
-        timer_handle_;
-
-    // After the initial Happy Eyeballs pass, the number of failures
-    // we've seen.  Every size() failures, we trigger re-resolution.
-    size_t num_failures_ = 0;
-
-    // The status from the last subchannel that reported TRANSIENT_FAILURE.
-    absl::Status last_failure_;
-  };
-
-  class HealthWatcher final
-      : public SubchannelInterface::ConnectivityStateWatcherInterface {
-   public:
-    HealthWatcher(RefCountedPtr<OldPickFirst> policy,
-                  absl::string_view resolution_note)
-        : policy_(std::move(policy)), resolution_note_(resolution_note) {}
-
-    ~HealthWatcher() override {
-      policy_.reset(DEBUG_LOCATION, "HealthWatcher dtor");
-    }
-
-    void OnConnectivityStateChange(grpc_connectivity_state new_state,
-                                   absl::Status status) override;
-
-    grpc_pollset_set* interested_parties() override {
-      return policy_->interested_parties();
-    }
-
-   private:
-    RefCountedPtr<OldPickFirst> policy_;
-    std::string resolution_note_;
-  };
-
-  class Picker final : public SubchannelPicker {
-   public:
-    explicit Picker(RefCountedPtr<SubchannelInterface> subchannel)
-        : subchannel_(std::move(subchannel)) {}
-
-    PickResult Pick(PickArgs /*args*/) override {
-      return PickResult::Complete(subchannel_);
-    }
-
-   private:
-    RefCountedPtr<SubchannelInterface> subchannel_;
-  };
-
-  void ShutdownLocked() override;
-
-  void UpdateState(grpc_connectivity_state state, const absl::Status& status,
-                   RefCountedPtr<SubchannelPicker> picker);
-
-  void AttemptToConnectUsingLatestUpdateArgsLocked();
-
-  void UnsetSelectedSubchannel();
-
-  // When ExitIdleLocked() is called, we create a subchannel_list_ and start
-  // trying to connect, but we don't actually change state_ until the first
-  // subchannel reports CONNECTING.  So in order to know if we're really
-  // idle, we need to check both state_ and subchannel_list_.
-  bool IsIdle() const {
-    return state_ == GRPC_CHANNEL_IDLE && subchannel_list_ == nullptr;
-  }
-
-  // Whether we should enable health watching.
-  const bool enable_health_watch_;
-  // Whether we should omit our status message prefix.
-  const bool omit_status_message_prefix_;
-  // Connection Attempt Delay for Happy Eyeballs.
-  const Duration connection_attempt_delay_;
-
-  // Lateset update args.
-  UpdateArgs latest_update_args_;
-  // All our subchannels.
-  OrphanablePtr<SubchannelList> subchannel_list_;
-  // Latest pending subchannel list.
-  OrphanablePtr<SubchannelList> latest_pending_subchannel_list_;
-  // Selected subchannel in subchannel_list_.
-  SubchannelList::SubchannelData* selected_ = nullptr;
-  // Health watcher for the selected subchannel.
-  SubchannelInterface::ConnectivityStateWatcherInterface* health_watcher_ =
-      nullptr;
-  SubchannelInterface::DataWatcherInterface* health_data_watcher_ = nullptr;
-  // Current connectivity state.
-  grpc_connectivity_state state_ = GRPC_CHANNEL_CONNECTING;
-  // Are we shut down?
-  bool shutdown_ = false;
-  // Random bit generator used for shuffling addresses if configured
-  absl::BitGen bit_gen_;
-};
-
-OldPickFirst::OldPickFirst(Args args)
-    : LoadBalancingPolicy(std::move(args)),
-      enable_health_watch_(
-          channel_args()
-              .GetBool(GRPC_ARG_INTERNAL_PICK_FIRST_ENABLE_HEALTH_CHECKING)
-              .value_or(false)),
-      omit_status_message_prefix_(
-          channel_args()
-              .GetBool(GRPC_ARG_INTERNAL_PICK_FIRST_OMIT_STATUS_MESSAGE_PREFIX)
-              .value_or(false)),
-      connection_attempt_delay_(Duration::Milliseconds(
-          Clamp(channel_args()
-                    .GetInt(GRPC_ARG_HAPPY_EYEBALLS_CONNECTION_ATTEMPT_DELAY_MS)
-                    .value_or(250),
-                100, 2000))) {
-  GRPC_TRACE_LOG(pick_first, INFO) << "Pick First " << this << " created.";
-}
-
-OldPickFirst::~OldPickFirst() {
-  GRPC_TRACE_LOG(pick_first, INFO) << "Destroying Pick First " << this;
-  CHECK(subchannel_list_ == nullptr);
-  CHECK(latest_pending_subchannel_list_ == nullptr);
-}
-
-void OldPickFirst::ShutdownLocked() {
-  GRPC_TRACE_LOG(pick_first, INFO) << "Pick First " << this << " Shutting down";
-  shutdown_ = true;
-  UnsetSelectedSubchannel();
-  subchannel_list_.reset();
-  latest_pending_subchannel_list_.reset();
-}
-
-void OldPickFirst::ExitIdleLocked() {
-  if (shutdown_) return;
-  if (IsIdle()) {
-    GRPC_TRACE_LOG(pick_first, INFO)
-        << "Pick First " << this << " exiting idle";
-    AttemptToConnectUsingLatestUpdateArgsLocked();
-  }
-}
-
-void OldPickFirst::ResetBackoffLocked() {
-  if (subchannel_list_ != nullptr) subchannel_list_->ResetBackoffLocked();
-  if (latest_pending_subchannel_list_ != nullptr) {
-    latest_pending_subchannel_list_->ResetBackoffLocked();
-  }
-}
-
-void OldPickFirst::AttemptToConnectUsingLatestUpdateArgsLocked() {
-  // Create a subchannel list from latest_update_args_.
-  EndpointAddressesIterator* addresses = nullptr;
-  if (latest_update_args_.addresses.ok()) {
-    addresses = latest_update_args_.addresses->get();
-  }
-  // Replace latest_pending_subchannel_list_.
-  if (GRPC_TRACE_FLAG_ENABLED(pick_first) &&
-      latest_pending_subchannel_list_ != nullptr) {
-    LOG(INFO) << "[PF " << this
-              << "] Shutting down previous pending subchannel list "
-              << latest_pending_subchannel_list_.get();
-  }
-  latest_pending_subchannel_list_ = MakeOrphanable<SubchannelList>(
-      RefAsSubclass<OldPickFirst>(), addresses, latest_update_args_.args,
-      latest_update_args_.resolution_note);
-  // Empty update or no valid subchannels.  Put the channel in
-  // TRANSIENT_FAILURE and request re-resolution.
-  if (latest_pending_subchannel_list_->size() == 0) {
-    channel_control_helper()->RequestReresolution();
-    absl::Status status = latest_update_args_.addresses.ok()
-                              ? absl::UnavailableError("empty address list")
-                              : latest_update_args_.addresses.status();
-    latest_pending_subchannel_list_->ReportTransientFailure(std::move(status));
-  }
-  // If the new update is empty or we don't yet have a selected subchannel in
-  // the current list, replace the current subchannel list immediately.
-  if (latest_pending_subchannel_list_->size() == 0 || selected_ == nullptr) {
-    UnsetSelectedSubchannel();
-    if (GRPC_TRACE_FLAG_ENABLED(pick_first) && subchannel_list_ != nullptr) {
-      LOG(INFO) << "[PF " << this << "] Shutting down previous subchannel list "
-                << subchannel_list_.get();
-    }
-    subchannel_list_ = std::move(latest_pending_subchannel_list_);
-  }
-}
-
-absl::Status OldPickFirst::UpdateLocked(UpdateArgs args) {
-  if (GRPC_TRACE_FLAG_ENABLED(pick_first)) {
-    if (args.addresses.ok()) {
-      LOG(INFO) << "Pick First " << this << " received update";
-    } else {
-      LOG(INFO) << "Pick First " << this
-                << " received update with address error: "
-                << args.addresses.status();
-    }
-  }
-  // Set return status based on the address list.
-  absl::Status status;
-  if (!args.addresses.ok()) {
-    status = args.addresses.status();
-  } else {
-    EndpointAddressesList endpoints;
-    (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
-      endpoints.push_back(endpoint);
-    });
-    if (endpoints.empty()) {
-      status = absl::UnavailableError("address list must not be empty");
-    } else {
-      // Shuffle the list if needed.
-      auto config = static_cast<PickFirstConfig*>(args.config.get());
-      if (config->shuffle_addresses()) {
-        absl::c_shuffle(endpoints, bit_gen_);
-      }
-      // Flatten the list so that we have one address per endpoint.
-      // While we're iterating, also determine the desired address family
-      // order and the index of the first element of each family, for use in
-      // the interleaving below.
-      std::set<absl::string_view> address_families;
-      std::vector<AddressFamilyIterator> address_family_order;
-      EndpointAddressesList flattened_endpoints;
-      for (const auto& endpoint : endpoints) {
-        for (const auto& address : endpoint.addresses()) {
-          flattened_endpoints.emplace_back(address, endpoint.args());
-          absl::string_view scheme = GetAddressFamily(address);
-          bool inserted = address_families.insert(scheme).second;
-          if (inserted) {
-            address_family_order.emplace_back(scheme,
-                                              flattened_endpoints.size() - 1);
-          }
-        }
-      }
-      endpoints = std::move(flattened_endpoints);
-      // Interleave addresses as per RFC-8305 section 4.
-      EndpointAddressesList interleaved_endpoints;
-      interleaved_endpoints.reserve(endpoints.size());
-      std::vector<bool> endpoints_moved(endpoints.size());
-      size_t scheme_index = 0;
-      for (size_t i = 0; i < endpoints.size(); ++i) {
-        EndpointAddresses* endpoint;
-        do {
-          auto& iterator = address_family_order[scheme_index++ %
-                                                address_family_order.size()];
-          endpoint = iterator.Next(endpoints, &endpoints_moved);
-        } while (endpoint == nullptr);
-        interleaved_endpoints.emplace_back(std::move(*endpoint));
-      }
-      endpoints = std::move(interleaved_endpoints);
-      args.addresses =
-          std::make_shared<EndpointAddressesListIterator>(std::move(endpoints));
-    }
-  }
-  // If the update contains a resolver error and we have a previous update
-  // that was not a resolver error, keep using the previous addresses.
-  if (!args.addresses.ok() && latest_update_args_.config != nullptr) {
-    args.addresses = std::move(latest_update_args_.addresses);
-  }
-  // Update latest_update_args_.
-  latest_update_args_ = std::move(args);
-  // If we are not in idle, start connection attempt immediately.
-  // Otherwise, we defer the attempt into ExitIdleLocked().
-  if (!IsIdle()) {
-    AttemptToConnectUsingLatestUpdateArgsLocked();
-  }
-  return status;
-}
-
-void OldPickFirst::UpdateState(grpc_connectivity_state state,
-                               const absl::Status& status,
-                               RefCountedPtr<SubchannelPicker> picker) {
-  state_ = state;
-  channel_control_helper()->UpdateState(state, status, std::move(picker));
-}
-
-void OldPickFirst::UnsetSelectedSubchannel() {
-  if (selected_ != nullptr && health_data_watcher_ != nullptr) {
-    selected_->subchannel()->CancelDataWatcher(health_data_watcher_);
-  }
-  selected_ = nullptr;
-  health_watcher_ = nullptr;
-  health_data_watcher_ = nullptr;
-}
-
-//
-// OldPickFirst::HealthWatcher
-//
-
-void OldPickFirst::HealthWatcher::OnConnectivityStateChange(
-    grpc_connectivity_state new_state, absl::Status status) {
-  if (policy_->health_watcher_ != this) return;
-  GRPC_TRACE_LOG(pick_first, INFO)
-      << "[PF " << policy_.get()
-      << "] health watch state update: " << ConnectivityStateName(new_state)
-      << " (" << status << ")";
-  switch (new_state) {
-    case GRPC_CHANNEL_READY:
-      policy_->channel_control_helper()->UpdateState(
-          GRPC_CHANNEL_READY, absl::OkStatus(),
-          MakeRefCounted<Picker>(policy_->selected_->subchannel()->Ref()));
-      break;
-    case GRPC_CHANNEL_IDLE:
-      // If the subchannel becomes disconnected, the health watcher
-      // might happen to see the change before the raw connectivity
-      // state watcher does.  In this case, ignore it, since the raw
-      // connectivity state watcher will handle it shortly.
-      break;
-    case GRPC_CHANNEL_CONNECTING:
-      policy_->channel_control_helper()->UpdateState(
-          new_state, absl::OkStatus(),
-          MakeRefCounted<QueuePicker>(policy_->Ref()));
-      break;
-    case GRPC_CHANNEL_TRANSIENT_FAILURE: {
-      std::string message = absl::StrCat("health watch: ", status.message());
-      if (!resolution_note_.empty()) {
-        absl::StrAppend(&message, " (", resolution_note_, ")");
-      }
-      policy_->channel_control_helper()->UpdateState(
-          GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-          MakeRefCounted<TransientFailurePicker>(
-              absl::UnavailableError(message)));
-      break;
-    }
-    case GRPC_CHANNEL_SHUTDOWN:
-      Crash("health watcher reported state SHUTDOWN");
-  }
-}
-
-//
-// OldPickFirst::SubchannelList::SubchannelData
-//
-
-OldPickFirst::SubchannelList::SubchannelData::SubchannelData(
-    SubchannelList* subchannel_list, size_t index,
-    RefCountedPtr<SubchannelInterface> subchannel)
-    : subchannel_list_(subchannel_list),
-      index_(index),
-      subchannel_(std::move(subchannel)) {
-  GRPC_TRACE_LOG(pick_first, INFO)
-      << "[PF " << subchannel_list_->policy_.get() << "] subchannel list "
-      << subchannel_list_ << " index " << index_ << " (subchannel "
-      << subchannel_.get() << "): starting watch";
-  auto watcher = std::make_unique<Watcher>(
-      subchannel_list_->Ref(DEBUG_LOCATION, "Watcher"), index_);
-  pending_watcher_ = watcher.get();
-  subchannel_->WatchConnectivityState(std::move(watcher));
-}
-
-void OldPickFirst::SubchannelList::SubchannelData::ShutdownLocked() {
-  if (subchannel_ != nullptr) {
-    GRPC_TRACE_LOG(pick_first, INFO)
-        << "[PF " << subchannel_list_->policy_.get() << "] subchannel list "
-        << subchannel_list_ << " index " << index_ << " of "
-        << subchannel_list_->size() << " (subchannel " << subchannel_.get()
-        << "): cancelling watch and unreffing subchannel";
-    subchannel_->CancelConnectivityStateWatch(pending_watcher_);
-    pending_watcher_ = nullptr;
-    subchannel_.reset();
-  }
-}
-
-void OldPickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
-    grpc_connectivity_state new_state, absl::Status status) {
-  OldPickFirst* p = subchannel_list_->policy_.get();
-  GRPC_TRACE_LOG(pick_first, INFO)
-      << "[PF " << p << "] subchannel list " << subchannel_list_ << " index "
-      << index_ << " of " << subchannel_list_->size() << " (subchannel "
-      << subchannel_.get() << "): connectivity changed: old_state="
-      << (connectivity_state_.has_value()
-              ? ConnectivityStateName(*connectivity_state_)
-              : "N/A")
-      << ", new_state=" << ConnectivityStateName(new_state)
-      << ", status=" << status
-      << ", shutting_down=" << subchannel_list_->shutting_down_
-      << ", pending_watcher=" << pending_watcher_
-      << ", seen_transient_failure=" << seen_transient_failure_
-      << ", p->selected_=" << p->selected_
-      << ", p->subchannel_list_=" << p->subchannel_list_.get()
-      << ", p->latest_pending_subchannel_list_="
-      << p->latest_pending_subchannel_list_.get();
-  if (subchannel_list_->shutting_down_ || pending_watcher_ == nullptr) return;
-  auto& stats_plugins = subchannel_list_->policy_->channel_control_helper()
-                            ->GetStatsPluginGroup();
-  // The notification must be for a subchannel in either the current or
-  // latest pending subchannel lists.
-  CHECK(subchannel_list_ == p->subchannel_list_.get() ||
-        subchannel_list_ == p->latest_pending_subchannel_list_.get());
-  CHECK(new_state != GRPC_CHANNEL_SHUTDOWN);
-  absl::optional<grpc_connectivity_state> old_state = connectivity_state_;
-  connectivity_state_ = new_state;
-  connectivity_status_ = std::move(status);
-  // Handle updates for the currently selected subchannel.
-  if (p->selected_ == this) {
-    CHECK(subchannel_list_ == p->subchannel_list_.get());
-    GRPC_TRACE_LOG(pick_first, INFO)
-        << "Pick First " << p << " selected subchannel connectivity changed to "
-        << ConnectivityStateName(new_state);
-    // Any state change is considered to be a failure of the existing
-    // connection.
-    stats_plugins.AddCounter(
-        kMetricDisconnections, 1,
-        {subchannel_list_->policy_->channel_control_helper()->GetTarget()}, {});
-    // TODO(roth): We could check the connectivity states of all the
-    // subchannels here, just in case one of them happens to be READY,
-    // and we could switch to that rather than going IDLE.
-    // Request a re-resolution.
-    // TODO(qianchengz): We may want to request re-resolution in
-    // ExitIdleLocked().
-    p->channel_control_helper()->RequestReresolution();
-    // If there is a pending update, switch to the pending update.
-    if (p->latest_pending_subchannel_list_ != nullptr) {
-      GRPC_TRACE_LOG(pick_first, INFO)
-          << "Pick First " << p << " promoting pending subchannel list "
-          << p->latest_pending_subchannel_list_.get() << " to replace "
-          << p->subchannel_list_.get();
-      p->UnsetSelectedSubchannel();
-      p->subchannel_list_ = std::move(p->latest_pending_subchannel_list_);
-      // Set our state to that of the pending subchannel list.
-      if (p->subchannel_list_->IsHappyEyeballsPassComplete()) {
-        status = absl::UnavailableError(absl::StrCat(
-            "selected subchannel failed; switching to pending update; "
-            "last failure: ",
-            p->subchannel_list_->last_failure_.ToString()));
-        subchannel_list_->ReportTransientFailure(std::move(status));
-      } else if (p->state_ != GRPC_CHANNEL_TRANSIENT_FAILURE) {
-        p->UpdateState(GRPC_CHANNEL_CONNECTING, absl::OkStatus(),
-                       MakeRefCounted<QueuePicker>(nullptr));
-      }
-      return;
-    }
-    // Enter idle.
-    p->UnsetSelectedSubchannel();
-    p->subchannel_list_.reset();
-    p->UpdateState(
-        GRPC_CHANNEL_IDLE, absl::OkStatus(),
-        MakeRefCounted<QueuePicker>(p->Ref(DEBUG_LOCATION, "QueuePicker")));
-    return;
-  }
-  // If we get here, there are two possible cases:
-  // 1. We do not currently have a selected subchannel, and the update is
-  //    for a subchannel in p->subchannel_list_ that we're trying to
-  //    connect to.  The goal here is to find a subchannel that we can
-  //    select.
-  // 2. We do currently have a selected subchannel, and the update is
-  //    for a subchannel in p->latest_pending_subchannel_list_.  The
-  //    goal here is to find a subchannel from the update that we can
-  //    select in place of the current one.
-  // If the subchannel is READY, use it.
-  if (new_state == GRPC_CHANNEL_READY) {
-    // We consider it a successful connection attempt only if the
-    // previous state was CONNECTING.  In particular, we don't want to
-    // increment this counter if we got a new address list and found the
-    // existing connection already in state READY.
-    if (old_state == GRPC_CHANNEL_CONNECTING) {
-      stats_plugins.AddCounter(
-          kMetricConnectionAttemptsSucceeded, 1,
-          {subchannel_list_->policy_->channel_control_helper()->GetTarget()},
-          {});
-    }
-    ProcessUnselectedReadyLocked();
-    return;
-  }
-  // Make sure we note when a subchannel has seen TRANSIENT_FAILURE.
-  bool prev_seen_transient_failure = seen_transient_failure_;
-  if (new_state == GRPC_CHANNEL_TRANSIENT_FAILURE) {
-    seen_transient_failure_ = true;
-    subchannel_list_->last_failure_ = connectivity_status_;
-  }
-  // If this is the initial connectivity state update for this subchannel,
-  // increment the counter in the subchannel list.
-  if (!old_state.has_value()) {
-    ++subchannel_list_->num_subchannels_seen_initial_notification_;
-  }
-  // If we haven't yet seen the initial connectivity state notification
-  // for all subchannels, do nothing.
-  if (!subchannel_list_->AllSubchannelsSeenInitialState()) return;
-  // If we're still here and this is the initial connectivity state
-  // notification for this subchannel, that means it was the last one to
-  // see its initial notification.  Start trying to connect, starting
-  // with the first subchannel.
-  if (!old_state.has_value()) {
-    subchannel_list_->StartConnectingNextSubchannel();
-    return;
-  }
-  // We've already started trying to connect.  Any subchannel that
-  // reports TF is a connection attempt failure.
-  if (new_state == GRPC_CHANNEL_TRANSIENT_FAILURE) {
-    stats_plugins.AddCounter(
-        kMetricConnectionAttemptsFailed, 1,
-        {subchannel_list_->policy_->channel_control_helper()->GetTarget()}, {});
-  }
-  // Otherwise, process connectivity state change.
-  switch (*connectivity_state_) {
-    case GRPC_CHANNEL_TRANSIENT_FAILURE: {
-      // If this is the first failure we've seen on this subchannel,
-      // then we're still in the Happy Eyeballs pass.
-      if (!prev_seen_transient_failure && seen_transient_failure_) {
-        // If a connection attempt fails before the timer fires, then
-        // cancel the timer and start connecting on the next subchannel.
-        if (index_ == subchannel_list_->attempting_index_) {
-          if (subchannel_list_->timer_handle_.has_value()) {
-            p->channel_control_helper()->GetEventEngine()->Cancel(
-                *subchannel_list_->timer_handle_);
-          }
-          ++subchannel_list_->attempting_index_;
-          subchannel_list_->StartConnectingNextSubchannel();
-        } else {
-          // If this was the last subchannel to fail, check if the Happy
-          // Eyeballs pass is complete.
-          subchannel_list_->MaybeFinishHappyEyeballsPass();
-        }
-      } else if (subchannel_list_->IsHappyEyeballsPassComplete()) {
-        // We're done with the initial Happy Eyeballs pass and in a mode
-        // where we're attempting to connect to every subchannel in
-        // parallel.  We count the number of failed connection attempts,
-        // and when that is equal to the number of subchannels, request
-        // re-resolution and report TRANSIENT_FAILURE again, so that the
-        // caller has the most recent status message.  Note that this
-        // isn't necessarily the same as saying that we've seen one
-        // failure for each subchannel in the list, because the backoff
-        // state may be different in each subchannel, so we may have seen
-        // one subchannel fail more than once and another subchannel not
-        // fail at all.  But it's a good enough heuristic.
-        ++subchannel_list_->num_failures_;
-        if (subchannel_list_->num_failures_ % subchannel_list_->size() == 0) {
-          p->channel_control_helper()->RequestReresolution();
-          status = absl::UnavailableError(absl::StrCat(
-              (p->omit_status_message_prefix_
-                   ? ""
-                   : "failed to connect to all addresses; last error: "),
-              connectivity_status_.ToString()));
-          subchannel_list_->ReportTransientFailure(std::move(status));
-        }
-      }
-      break;
-    }
-    case GRPC_CHANNEL_IDLE:
-      // If we've finished the first Happy Eyeballs pass, then we go
-      // into a mode where we immediately try to connect to every
-      // subchannel in parallel.
-      if (subchannel_list_->IsHappyEyeballsPassComplete()) {
-        subchannel_->RequestConnection();
-      }
-      break;
-    case GRPC_CHANNEL_CONNECTING:
-      // Only update connectivity state in case 1, and only if we're not
-      // already in TRANSIENT_FAILURE.
-      if (subchannel_list_ == p->subchannel_list_.get() &&
-          p->state_ != GRPC_CHANNEL_TRANSIENT_FAILURE) {
-        p->UpdateState(GRPC_CHANNEL_CONNECTING, absl::OkStatus(),
-                       MakeRefCounted<QueuePicker>(nullptr));
-      }
-      break;
-    default:
-      // We handled READY above, and we should never see SHUTDOWN.
-      GPR_UNREACHABLE_CODE(break);
-  }
-}
-
-void OldPickFirst::SubchannelList::SubchannelData::
-    RequestConnectionWithTimer() {
-  CHECK(connectivity_state_.has_value());
-  if (connectivity_state_ == GRPC_CHANNEL_IDLE) {
-    subchannel_->RequestConnection();
-  } else {
-    CHECK(connectivity_state_ == GRPC_CHANNEL_CONNECTING);
-  }
-  // If this is not the last subchannel in the list, start the timer.
-  if (index_ != subchannel_list_->size() - 1) {
-    OldPickFirst* p = subchannel_list_->policy_.get();
-    GRPC_TRACE_LOG(pick_first, INFO)
-        << "Pick First " << p << " subchannel list " << subchannel_list_
-        << ": starting Connection Attempt Delay timer for "
-        << p->connection_attempt_delay_.millis() << "ms for index " << index_;
-    subchannel_list_->timer_handle_ =
-        p->channel_control_helper()->GetEventEngine()->RunAfter(
-            p->connection_attempt_delay_,
-            [subchannel_list =
-                 subchannel_list_->Ref(DEBUG_LOCATION, "timer")]() mutable {
-              ApplicationCallbackExecCtx application_exec_ctx;
-              ExecCtx exec_ctx;
-              auto* sl = subchannel_list.get();
-              sl->policy_->work_serializer()->Run(
-                  [subchannel_list = std::move(subchannel_list)]() {
-                    GRPC_TRACE_LOG(pick_first, INFO)
-                        << "Pick First " << subchannel_list->policy_.get()
-                        << " subchannel list " << subchannel_list.get()
-                        << ": Connection Attempt Delay timer fired "
-                        << "(shutting_down=" << subchannel_list->shutting_down_
-                        << ", selected=" << subchannel_list->policy_->selected_
-                        << ")";
-                    if (subchannel_list->shutting_down_) return;
-                    if (subchannel_list->policy_->selected_ != nullptr) return;
-                    ++subchannel_list->attempting_index_;
-                    subchannel_list->StartConnectingNextSubchannel();
-                  },
-                  DEBUG_LOCATION);
-            });
-  }
-}
-
-void OldPickFirst::SubchannelList::SubchannelData::
-    ProcessUnselectedReadyLocked() {
-  OldPickFirst* p = subchannel_list_->policy_.get();
-  // Cancel Happy Eyeballs timer, if any.
-  if (subchannel_list_->timer_handle_.has_value()) {
-    p->channel_control_helper()->GetEventEngine()->Cancel(
-        *subchannel_list_->timer_handle_);
-  }
-  // If we get here, there are two possible cases:
-  // 1. We do not currently have a selected subchannel, and the update is
-  //    for a subchannel in p->subchannel_list_ that we're trying to
-  //    connect to.  The goal here is to find a subchannel that we can
-  //    select.
-  // 2. We do currently have a selected subchannel, and the update is
-  //    for a subchannel in p->latest_pending_subchannel_list_.  The
-  //    goal here is to find a subchannel from the update that we can
-  //    select in place of the current one.
-  CHECK(subchannel_list_ == p->subchannel_list_.get() ||
-        subchannel_list_ == p->latest_pending_subchannel_list_.get());
-  // Case 2.  Promote p->latest_pending_subchannel_list_ to p->subchannel_list_.
-  if (subchannel_list_ == p->latest_pending_subchannel_list_.get()) {
-    GRPC_TRACE_LOG(pick_first, INFO)
-        << "Pick First " << p << " promoting pending subchannel list "
-        << p->latest_pending_subchannel_list_.get() << " to replace "
-        << p->subchannel_list_.get();
-    p->UnsetSelectedSubchannel();
-    p->subchannel_list_ = std::move(p->latest_pending_subchannel_list_);
-  }
-  // Cases 1 and 2.
-  GRPC_TRACE_LOG(pick_first, INFO)
-      << "Pick First " << p << " selected subchannel " << subchannel_.get();
-  p->selected_ = this;
-  // If health checking is enabled, start the health watch, but don't
-  // report a new picker -- we want to stay in CONNECTING while we wait
-  // for the health status notification.
-  // If health checking is NOT enabled, report READY.
-  if (p->enable_health_watch_) {
-    GRPC_TRACE_LOG(pick_first, INFO)
-        << "[PF " << p << "] starting health watch";
-    auto watcher = std::make_unique<HealthWatcher>(
-        p->RefAsSubclass<OldPickFirst>(DEBUG_LOCATION, "HealthWatcher"),
-        subchannel_list_->resolution_note_);
-    p->health_watcher_ = watcher.get();
-    auto health_data_watcher = MakeHealthCheckWatcher(
-        p->work_serializer(), subchannel_list_->args_, std::move(watcher));
-    p->health_data_watcher_ = health_data_watcher.get();
-    subchannel_->AddDataWatcher(std::move(health_data_watcher));
-  } else {
-    p->UpdateState(GRPC_CHANNEL_READY, absl::OkStatus(),
-                   MakeRefCounted<Picker>(subchannel()->Ref()));
-  }
-  // Unref all other subchannels in the list.
-  for (size_t i = 0; i < subchannel_list_->size(); ++i) {
-    if (i != index_) {
-      subchannel_list_->subchannels_[i].ShutdownLocked();
-    }
-  }
-}
-
-//
-// OldPickFirst::SubchannelList
-//
-
-OldPickFirst::SubchannelList::SubchannelList(
-    RefCountedPtr<OldPickFirst> policy, EndpointAddressesIterator* addresses,
-    const ChannelArgs& args, absl::string_view resolution_note)
-    : InternallyRefCounted<SubchannelList>(
-          GRPC_TRACE_FLAG_ENABLED(pick_first) ? "SubchannelList" : nullptr),
-      policy_(std::move(policy)),
-      args_(
-          args.Remove(GRPC_ARG_INTERNAL_PICK_FIRST_ENABLE_HEALTH_CHECKING)
-              .Remove(GRPC_ARG_INTERNAL_PICK_FIRST_OMIT_STATUS_MESSAGE_PREFIX)),
-      resolution_note_(resolution_note) {
-  GRPC_TRACE_LOG(pick_first, INFO)
-      << "[PF " << policy_.get() << "] Creating subchannel list " << this
-      << " - channel args: " << args_.ToString();
-  if (addresses == nullptr) return;
-  // Create a subchannel for each address.
-  addresses->ForEach([&](const EndpointAddresses& address) {
-    CHECK_EQ(address.addresses().size(), 1u);
-    RefCountedPtr<SubchannelInterface> subchannel =
-        policy_->channel_control_helper()->CreateSubchannel(
-            address.address(), address.args(), args_);
-    if (subchannel == nullptr) {
-      // Subchannel could not be created.
-      GRPC_TRACE_LOG(pick_first, INFO)
-          << "[PF " << policy_.get()
-          << "] could not create subchannel for address " << address.ToString()
-          << ", ignoring";
-      return;
-    }
-    GRPC_TRACE_LOG(pick_first, INFO)
-        << "[PF " << policy_.get() << "] subchannel list " << this << " index "
-        << subchannels_.size() << ": Created subchannel " << subchannel.get()
-        << " for address " << address.ToString();
-    subchannels_.emplace_back(this, subchannels_.size(), std::move(subchannel));
-  });
-}
-
-OldPickFirst::SubchannelList::~SubchannelList() {
-  GRPC_TRACE_LOG(pick_first, INFO)
-      << "[PF " << policy_.get() << "] Destroying subchannel_list " << this;
-}
-
-void OldPickFirst::SubchannelList::Orphan() {
-  GRPC_TRACE_LOG(pick_first, INFO)
-      << "[PF " << policy_.get() << "] Shutting down subchannel_list " << this;
-  CHECK(!shutting_down_);
-  shutting_down_ = true;
-  for (auto& sd : subchannels_) {
-    sd.ShutdownLocked();
-  }
-  if (timer_handle_.has_value()) {
-    policy_->channel_control_helper()->GetEventEngine()->Cancel(*timer_handle_);
-  }
-  Unref();
-}
-
-void OldPickFirst::SubchannelList::ResetBackoffLocked() {
-  for (auto& sd : subchannels_) {
-    sd.ResetBackoffLocked();
-  }
-}
-
-void OldPickFirst::SubchannelList::ReportTransientFailure(absl::Status status) {
-  if (!resolution_note_.empty()) {
-    status = absl::Status(status.code(), absl::StrCat(status.message(), " (",
-                                                      resolution_note_, ")"));
-  }
-  policy_->UpdateState(GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-                       MakeRefCounted<TransientFailurePicker>(status));
-}
-
-void OldPickFirst::SubchannelList::StartConnectingNextSubchannel() {
-  // Find the next subchannel not in state TRANSIENT_FAILURE.
-  // We skip subchannels in state TRANSIENT_FAILURE to avoid a
-  // large recursion that could overflow the stack.
-  for (; attempting_index_ < size(); ++attempting_index_) {
-    SubchannelData* sc = &subchannels_[attempting_index_];
-    CHECK(sc->connectivity_state().has_value());
-    if (sc->connectivity_state() != GRPC_CHANNEL_TRANSIENT_FAILURE) {
-      // Found a subchannel not in TRANSIENT_FAILURE, so trigger a
-      // connection attempt.
-      sc->RequestConnectionWithTimer();
-      return;
-    }
-  }
-  // If we didn't find a subchannel to request a connection on, check to
-  // see if the Happy Eyeballs pass is complete.
-  MaybeFinishHappyEyeballsPass();
-}
-
-void OldPickFirst::SubchannelList::MaybeFinishHappyEyeballsPass() {
-  // Make sure all subchannels have finished a connection attempt before
-  // we consider the Happy Eyeballs pass complete.
-  if (!IsHappyEyeballsPassComplete()) return;
-  // We didn't find another subchannel not in state TRANSIENT_FAILURE,
-  // so report TRANSIENT_FAILURE and switch to a mode in which we try to
-  // connect to all addresses in parallel.
-  GRPC_TRACE_LOG(pick_first, INFO)
-      << "Pick First " << policy_.get() << " subchannel list " << this
-      << " failed to connect to all subchannels";
-  // In case 2, swap to the new subchannel list.  This means reporting
-  // TRANSIENT_FAILURE and dropping the existing (working) connection,
-  // but we can't ignore what the control plane has told us.
-  if (policy_->latest_pending_subchannel_list_.get() == this) {
-    GRPC_TRACE_LOG(pick_first, INFO)
-        << "Pick First " << policy_.get()
-        << " promoting pending subchannel list "
-        << policy_->latest_pending_subchannel_list_.get() << " to replace "
-        << this;
-    policy_->UnsetSelectedSubchannel();
-    policy_->subchannel_list_ =
-        std::move(policy_->latest_pending_subchannel_list_);
-  }
-  // If this is the current subchannel list (either because we were
-  // in case 1 or because we were in case 2 and just promoted it to
-  // be the current list), re-resolve and report new state.
-  if (policy_->subchannel_list_.get() == this) {
-    policy_->channel_control_helper()->RequestReresolution();
-    absl::Status status = absl::UnavailableError(
-        absl::StrCat((policy_->omit_status_message_prefix_
-                          ? ""
-                          : "failed to connect to all addresses; last error: "),
-                     last_failure_.ToString()));
-    ReportTransientFailure(std::move(status));
-  }
-  // We now transition into a mode where we try to connect to all
-  // subchannels in parallel.  For any subchannel currently in IDLE,
-  // trigger a connection attempt.  For any subchannel not currently in
-  // IDLE, we will trigger a connection attempt when it does report IDLE.
-  for (SubchannelData& sd : subchannels_) {
-    if (sd.connectivity_state() == GRPC_CHANNEL_IDLE) {
-      sd.RequestConnection();
-    }
-  }
-}
-
 //
 // factory
 //
@@ -2066,9 +1114,6 @@ class PickFirstFactory final : public LoadBalancingPolicyFactory {
  public:
   OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
       LoadBalancingPolicy::Args args) const override {
-    if (!IsPickFirstNewEnabled()) {
-      return MakeOrphanable<OldPickFirst>(std::move(args));
-    }
     return MakeOrphanable<PickFirst>(std::move(args));
   }