grpc 1.69.0 → 1.71.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,14 +240,14 @@ 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;
     };
 
     SubchannelList(RefCountedPtr<PickFirst> policy,
                    EndpointAddressesIterator* addresses,
-                   const ChannelArgs& args);
+                   const ChannelArgs& args, absl::string_view resolution_note);
 
     ~SubchannelList() override;
 
@@ -269,6 +270,8 @@ class PickFirst final : public LoadBalancingPolicy {
       return true;
     }
 
+    void ReportTransientFailure(absl::Status status);
+
    private:
     // Returns true if all subchannels have seen their initial
     // connectivity state notifications.
@@ -293,6 +296,7 @@ class PickFirst final : public LoadBalancingPolicy {
     RefCountedPtr<PickFirst> policy_;
 
     ChannelArgs args_;
+    std::string resolution_note_;
 
     // The list of subchannels.
     std::vector<std::unique_ptr<SubchannelData>> subchannels_;
@@ -309,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
@@ -323,8 +327,9 @@ class PickFirst final : public LoadBalancingPolicy {
   class HealthWatcher final
       : public SubchannelInterface::ConnectivityStateWatcherInterface {
    public:
-    explicit HealthWatcher(RefCountedPtr<PickFirst> policy)
-        : policy_(std::move(policy)) {}
+    HealthWatcher(RefCountedPtr<PickFirst> policy,
+                  absl::string_view resolution_note)
+        : policy_(std::move(policy)), resolution_note_(resolution_note) {}
 
     ~HealthWatcher() override {
       policy_.reset(DEBUG_LOCATION, "HealthWatcher dtor");
@@ -339,6 +344,7 @@ class PickFirst final : public LoadBalancingPolicy {
 
    private:
     RefCountedPtr<PickFirst> policy_;
+    std::string resolution_note_;
   };
 
   class Picker final : public SubchannelPicker {
@@ -459,19 +465,16 @@ void PickFirst::AttemptToConnectUsingLatestUpdateArgsLocked() {
   }
   subchannel_list_ = MakeOrphanable<SubchannelList>(
       RefAsSubclass<PickFirst>(DEBUG_LOCATION, "SubchannelList"), addresses,
-      latest_update_args_.args);
+      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.  Also unset the
   // current selected subchannel.
   if (subchannel_list_->size() == 0) {
     channel_control_helper()->RequestReresolution();
-    absl::Status status =
-        latest_update_args_.addresses.ok()
-            ? absl::UnavailableError(absl::StrCat(
-                  "empty address list: ", latest_update_args_.resolution_note))
-            : latest_update_args_.addresses.status();
-    UpdateState(GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-                MakeRefCounted<TransientFailurePicker>(status));
+    absl::Status status = latest_update_args_.addresses.ok()
+                              ? absl::UnavailableError("empty address list")
+                              : latest_update_args_.addresses.status();
+    subchannel_list_->ReportTransientFailure(std::move(status));
     UnsetSelectedSubchannel();
   }
 }
@@ -611,7 +614,7 @@ void PickFirst::GoIdle() {
   // ExitIdleLocked() instead.
   channel_control_helper()->RequestReresolution();
   // Enter idle.
-  UpdateState(GRPC_CHANNEL_IDLE, absl::Status(),
+  UpdateState(GRPC_CHANNEL_IDLE, absl::OkStatus(),
               MakeRefCounted<QueuePicker>(Ref(DEBUG_LOCATION, "QueuePicker")));
 }
 
@@ -643,12 +646,17 @@ void PickFirst::HealthWatcher::OnConnectivityStateChange(
           new_state, absl::OkStatus(),
           MakeRefCounted<QueuePicker>(policy_->Ref()));
       break;
-    case GRPC_CHANNEL_TRANSIENT_FAILURE:
+    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(
-              absl::StrCat("health watch: ", status.message()))));
+          MakeRefCounted<TransientFailurePicker>(
+              absl::UnavailableError(message)));
       break;
+    }
     case GRPC_CHANNEL_SHUTDOWN:
       Crash("health watcher reported state SHUTDOWN");
   }
@@ -700,7 +708,8 @@ void PickFirst::SubchannelList::SubchannelData::SubchannelState::Select() {
     GRPC_TRACE_LOG(pick_first, INFO)
         << "[PF " << pick_first_.get() << "] starting health watch";
     auto watcher = std::make_unique<HealthWatcher>(
-        pick_first_.Ref(DEBUG_LOCATION, "HealthWatcher"));
+        pick_first_.Ref(DEBUG_LOCATION, "HealthWatcher"),
+        subchannel_data_->subchannel_list_->resolution_note_);
     pick_first_->health_watcher_ = watcher.get();
     auto health_data_watcher = MakeHealthCheckWatcher(
         pick_first_->work_serializer(),
@@ -708,7 +717,7 @@ void PickFirst::SubchannelList::SubchannelData::SubchannelState::Select() {
     pick_first_->health_data_watcher_ = health_data_watcher.get();
     subchannel_->AddDataWatcher(std::move(health_data_watcher));
   } else {
-    pick_first_->UpdateState(GRPC_CHANNEL_READY, absl::Status(),
+    pick_first_->UpdateState(GRPC_CHANNEL_READY, absl::OkStatus(),
                              MakeRefCounted<Picker>(subchannel_));
   }
   // Report successful connection.
@@ -814,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,
@@ -865,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_) {
@@ -902,8 +911,7 @@ void PickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
                    ? ""
                    : "failed to connect to all addresses; last error: "),
               connectivity_status_.ToString()));
-          p->UpdateState(GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-                         MakeRefCounted<TransientFailurePicker>(status));
+          subchannel_list_->ReportTransientFailure(std::move(status));
         }
       }
       break;
@@ -921,7 +929,7 @@ void PickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
       // TRANSIENT_FAILURE.
       // TODO(roth): Squelch duplicate CONNECTING updates.
       if (p->state_ != GRPC_CHANNEL_TRANSIENT_FAILURE) {
-        p->UpdateState(GRPC_CHANNEL_CONNECTING, absl::Status(),
+        p->UpdateState(GRPC_CHANNEL_CONNECTING, absl::OkStatus(),
                        MakeRefCounted<QueuePicker>(nullptr));
       }
       break;
@@ -950,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(
@@ -966,8 +973,7 @@ void PickFirst::SubchannelList::SubchannelData::RequestConnectionWithTimer() {
                     if (subchannel_list->policy_->selected_ != nullptr) return;
                     ++subchannel_list->attempting_index_;
                     subchannel_list->StartConnectingNextSubchannel();
-                  },
-                  DEBUG_LOCATION);
+                  });
             });
   }
 }
@@ -978,13 +984,15 @@ void PickFirst::SubchannelList::SubchannelData::RequestConnectionWithTimer() {
 
 PickFirst::SubchannelList::SubchannelList(RefCountedPtr<PickFirst> policy,
                                           EndpointAddressesIterator* addresses,
-                                          const ChannelArgs& args)
+                                          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)) {
+      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();
@@ -1037,6 +1045,15 @@ void PickFirst::SubchannelList::ResetBackoffLocked() {
   }
 }
 
+void PickFirst::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 PickFirst::SubchannelList::StartConnectingNextSubchannel() {
   // Find the next subchannel not in state TRANSIENT_FAILURE.
   // We skip subchannels in state TRANSIENT_FAILURE to avoid a
@@ -1050,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.
@@ -1073,8 +1091,7 @@ void PickFirst::SubchannelList::MaybeFinishHappyEyeballsPass() {
                         ? ""
                         : "failed to connect to all addresses; last error: "),
                    last_failure_.ToString()));
-  policy_->UpdateState(GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-                       MakeRefCounted<TransientFailurePicker>(status));
+  ReportTransientFailure(std::move(status));
   // Drop the existing (working) connection, if any.  This may be
   // sub-optimal, but we can't ignore what the control plane told us.
   policy_->UnsetSelectedSubchannel();
@@ -1111,7 +1128,7 @@ class OldPickFirst final : public LoadBalancingPolicy {
                      RefCountedPtr<SubchannelInterface> subchannel);
 
       SubchannelInterface* subchannel() const { return subchannel_.get(); }
-      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 {
@@ -1134,6 +1151,7 @@ class OldPickFirst final : public LoadBalancingPolicy {
       void ShutdownLocked();
 
       bool seen_transient_failure() const { return seen_transient_failure_; }
+      void set_seen_transient_failure() { seen_transient_failure_ = true; }
 
      private:
       // Watcher for subchannel connectivity state.
@@ -1181,14 +1199,14 @@ class OldPickFirst final : public LoadBalancingPolicy {
       SubchannelInterface::ConnectivityStateWatcherInterface* pending_watcher_ =
           nullptr;
       // 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;
     };
 
     SubchannelList(RefCountedPtr<OldPickFirst> policy,
                    EndpointAddressesIterator* addresses,
-                   const ChannelArgs& args);
+                   const ChannelArgs& args, absl::string_view resolution_note);
 
     ~SubchannelList() override;
 
@@ -1211,6 +1229,8 @@ class OldPickFirst final : public LoadBalancingPolicy {
       return true;
     }
 
+    void ReportTransientFailure(absl::Status status);
+
    private:
     // Returns true if all subchannels have seen their initial
     // connectivity state notifications.
@@ -1235,6 +1255,7 @@ class OldPickFirst final : public LoadBalancingPolicy {
     RefCountedPtr<OldPickFirst> policy_;
 
     ChannelArgs args_;
+    std::string resolution_note_;
 
     // The list of subchannels.
     std::vector<SubchannelData> subchannels_;
@@ -1251,7 +1272,7 @@ class OldPickFirst 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
@@ -1265,8 +1286,9 @@ class OldPickFirst final : public LoadBalancingPolicy {
   class HealthWatcher final
       : public SubchannelInterface::ConnectivityStateWatcherInterface {
    public:
-    explicit HealthWatcher(RefCountedPtr<OldPickFirst> policy)
-        : policy_(std::move(policy)) {}
+    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");
@@ -1281,6 +1303,7 @@ class OldPickFirst final : public LoadBalancingPolicy {
 
    private:
     RefCountedPtr<OldPickFirst> policy_;
+    std::string resolution_note_;
   };
 
   class Picker final : public SubchannelPicker {
@@ -1402,18 +1425,16 @@ void OldPickFirst::AttemptToConnectUsingLatestUpdateArgsLocked() {
               << latest_pending_subchannel_list_.get();
   }
   latest_pending_subchannel_list_ = MakeOrphanable<SubchannelList>(
-      RefAsSubclass<OldPickFirst>(), addresses, latest_update_args_.args);
+      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(absl::StrCat(
-                  "empty address list: ", latest_update_args_.resolution_note))
-            : latest_update_args_.addresses.status();
-    UpdateState(GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-                MakeRefCounted<TransientFailurePicker>(status));
+    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.
@@ -1551,12 +1572,17 @@ void OldPickFirst::HealthWatcher::OnConnectivityStateChange(
           new_state, absl::OkStatus(),
           MakeRefCounted<QueuePicker>(policy_->Ref()));
       break;
-    case GRPC_CHANNEL_TRANSIENT_FAILURE:
+    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(
-              absl::StrCat("health watch: ", status.message()))));
+          MakeRefCounted<TransientFailurePicker>(
+              absl::UnavailableError(message)));
       break;
+    }
     case GRPC_CHANNEL_SHUTDOWN:
       Crash("health watcher reported state SHUTDOWN");
   }
@@ -1614,7 +1640,6 @@ void OldPickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
       << ", 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();
@@ -1623,7 +1648,7 @@ void OldPickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
   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_;
+  std::optional<grpc_connectivity_state> old_state = connectivity_state_;
   connectivity_state_ = new_state;
   connectivity_status_ = std::move(status);
   // Handle updates for the currently selected subchannel.
@@ -1658,10 +1683,9 @@ void OldPickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
             "selected subchannel failed; switching to pending update; "
             "last failure: ",
             p->subchannel_list_->last_failure_.ToString()));
-        p->UpdateState(GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-                       MakeRefCounted<TransientFailurePicker>(status));
+        subchannel_list_->ReportTransientFailure(std::move(status));
       } else if (p->state_ != GRPC_CHANNEL_TRANSIENT_FAILURE) {
-        p->UpdateState(GRPC_CHANNEL_CONNECTING, absl::Status(),
+        p->UpdateState(GRPC_CHANNEL_CONNECTING, absl::OkStatus(),
                        MakeRefCounted<QueuePicker>(nullptr));
       }
       return;
@@ -1670,7 +1694,7 @@ void OldPickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
     p->UnsetSelectedSubchannel();
     p->subchannel_list_.reset();
     p->UpdateState(
-        GRPC_CHANNEL_IDLE, absl::Status(),
+        GRPC_CHANNEL_IDLE, absl::OkStatus(),
         MakeRefCounted<QueuePicker>(p->Ref(DEBUG_LOCATION, "QueuePicker")));
     return;
   }
@@ -1698,10 +1722,8 @@ void OldPickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
     ProcessUnselectedReadyLocked();
     return;
   }
-  // Make sure we note when a subchannel has seen TRANSIENT_FAILURE.
-  bool prev_seen_transient_failure = seen_transient_failure_;
+  // Record status for TRANSIENT_FAILURE state.
   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,
@@ -1730,6 +1752,8 @@ void OldPickFirst::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_) {
@@ -1767,8 +1791,7 @@ void OldPickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
                    ? ""
                    : "failed to connect to all addresses; last error: "),
               connectivity_status_.ToString()));
-          p->UpdateState(GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-                         MakeRefCounted<TransientFailurePicker>(status));
+          subchannel_list_->ReportTransientFailure(std::move(status));
         }
       }
       break;
@@ -1786,7 +1809,7 @@ void OldPickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
       // already in TRANSIENT_FAILURE.
       if (subchannel_list_ == p->subchannel_list_.get() &&
           p->state_ != GRPC_CHANNEL_TRANSIENT_FAILURE) {
-        p->UpdateState(GRPC_CHANNEL_CONNECTING, absl::Status(),
+        p->UpdateState(GRPC_CHANNEL_CONNECTING, absl::OkStatus(),
                        MakeRefCounted<QueuePicker>(nullptr));
       }
       break;
@@ -1816,7 +1839,6 @@ void OldPickFirst::SubchannelList::SubchannelData::
             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(
@@ -1832,8 +1854,7 @@ void OldPickFirst::SubchannelList::SubchannelData::
                     if (subchannel_list->policy_->selected_ != nullptr) return;
                     ++subchannel_list->attempting_index_;
                     subchannel_list->StartConnectingNextSubchannel();
-                  },
-                  DEBUG_LOCATION);
+                  });
             });
   }
 }
@@ -1878,14 +1899,15 @@ void OldPickFirst::SubchannelList::SubchannelData::
     GRPC_TRACE_LOG(pick_first, INFO)
         << "[PF " << p << "] starting health watch";
     auto watcher = std::make_unique<HealthWatcher>(
-        p->RefAsSubclass<OldPickFirst>(DEBUG_LOCATION, "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::Status(),
+    p->UpdateState(GRPC_CHANNEL_READY, absl::OkStatus(),
                    MakeRefCounted<Picker>(subchannel()->Ref()));
   }
   // Unref all other subchannels in the list.
@@ -1902,13 +1924,14 @@ void OldPickFirst::SubchannelList::SubchannelData::
 
 OldPickFirst::SubchannelList::SubchannelList(
     RefCountedPtr<OldPickFirst> policy, EndpointAddressesIterator* addresses,
-    const ChannelArgs& args)
+    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)) {
+      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();
@@ -1960,6 +1983,15 @@ void OldPickFirst::SubchannelList::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
@@ -1973,6 +2005,7 @@ void OldPickFirst::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.
@@ -2012,8 +2045,7 @@ void OldPickFirst::SubchannelList::MaybeFinishHappyEyeballsPass() {
                           ? ""
                           : "failed to connect to all addresses; last error: "),
                      last_failure_.ToString()));
-    policy_->UpdateState(GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-                         MakeRefCounted<TransientFailurePicker>(status));
+    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,
@@ -2025,6 +2057,7 @@ void OldPickFirst::SubchannelList::MaybeFinishHappyEyeballsPass() {
     }
   }
 }
+
 //
 // factory
 //

data/src/core/load_balancing/priority/priority.cc

@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <map>
 #include <memory>
+#include <optional>
 #include <set>
 #include <string>
 #include <type_traits>
@@ -36,7 +37,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
@@ -190,7 +190,7 @@ class PriorityLb final : public LoadBalancingPolicy {
       void OnTimerLocked();
 
       RefCountedPtr<ChildPriority> child_priority_;
-      absl::optional<EventEngine::TaskHandle> timer_handle_;
+      std::optional<EventEngine::TaskHandle> timer_handle_;
     };
 
     class FailoverTimer final : public InternallyRefCounted<FailoverTimer> {
@@ -203,7 +203,7 @@ class PriorityLb final : public LoadBalancingPolicy {
       void OnTimerLocked();
 
       RefCountedPtr<ChildPriority> child_priority_;
-      absl::optional<EventEngine::TaskHandle> timer_handle_;
+      std::optional<EventEngine::TaskHandle> timer_handle_;
     };
 
     // Methods for dealing with the child policy.
@@ -318,7 +318,7 @@ void PriorityLb::ExitIdleLocked() {
 }
 
 void PriorityLb::ResetBackoffLocked() {
-  for (const auto& p : children_) p.second->ResetBackoffLocked();
+  for (const auto& [_, child] : children_) child->ResetBackoffLocked();
 }
 
 absl::Status PriorityLb::UpdateLocked(UpdateArgs args) {
@@ -334,9 +334,7 @@ absl::Status PriorityLb::UpdateLocked(UpdateArgs args) {
   // Check all existing children against the new config.
   update_in_progress_ = true;
   std::vector<std::string> errors;
-  for (const auto& p : children_) {
-    const std::string& child_name = p.first;
-    auto& child = p.second;
+  for (const auto& [child_name, child] : children_) {
     auto config_it = config_->children().find(child_name);
     if (config_it == config_->children().end()) {
       // Existing child not found in new config.  Deactivate it.
@@ -505,12 +503,10 @@ PriorityLb::ChildPriority::DeactivationTimer::DeactivationTimer(
           ->GetEventEngine()
           ->RunAfter(kChildRetentionInterval, [self = Ref(DEBUG_LOCATION,
                                                           "Timer")]() mutable {
-            ApplicationCallbackExecCtx callback_exec_ctx;
             ExecCtx exec_ctx;
             auto self_ptr = self.get();
             self_ptr->child_priority_->priority_policy_->work_serializer()->Run(
-                [self = std::move(self)]() { self->OnTimerLocked(); },
-                DEBUG_LOCATION);
+                [self = std::move(self)]() { self->OnTimerLocked(); });
           });
 }
 
@@ -558,12 +554,11 @@ PriorityLb::ChildPriority::FailoverTimer::FailoverTimer(
           ->RunAfter(
               child_priority_->priority_policy_->child_failover_timeout_,
               [self = Ref(DEBUG_LOCATION, "Timer")]() mutable {
-                ApplicationCallbackExecCtx callback_exec_ctx;
                 ExecCtx exec_ctx;
                 auto self_ptr = self.get();
                 self_ptr->child_priority_->priority_policy_->work_serializer()
-                    ->Run([self = std::move(self)]() { self->OnTimerLocked(); },
-                          DEBUG_LOCATION);
+                    ->Run(
+                        [self = std::move(self)]() { self->OnTimerLocked(); });
               });
 }