diff options
| author |  Mark D. Roth <roth@google.com> | 2018-05-01 09:09:17 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2018-05-01 09:09:17 -0700 |
| commit | 08718181e39ee830826335a546ae165983350843 (patch) | |
| tree | c5881dc4aeaae5c4b9f7abb7f2d38ce9d74ca8eb /src | |
| parent | a25ece9f6a98721f6bc983de4c376d9766d36ae3 (diff) | |
Make sure we set error for transient_failure state.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index 4db28fb18c..92e738c7bd 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -402,7 +402,12 @@ void PickFirst::PickFirstSubchannelData::ProcessConnectivityChangeLocked( p->subchannel_list_ = std::move(p->latest_pending_subchannel_list_); grpc_connectivity_state_set( &p->state_tracker_, GRPC_CHANNEL_TRANSIENT_FAILURE, - GRPC_ERROR_REF(error), "selected_not_ready+switch_to_update"); + error != GRPC_ERROR_NONE + ? GRPC_ERROR_REF(error) + : GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "selected subchannel not ready; switching to pending " + "update"), + "selected_not_ready+switch_to_update"); } else { // TODO(juanlishen): we re-resolve when the selected subchannel goes to // TRANSIENT_FAILURE because we used to shut down in this case before |