From 8e354419f478898c957aed82e8ea2c07057259db Mon Sep 17 00:00:00 2001 From: Juanli Shen Date: Tue, 14 Aug 2018 18:03:17 -0700 Subject: [PATCH] Fix LR test --- .../lb_policy/pick_first/pick_first.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 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 1cd5ef065de..ab33d933981 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 @@ -285,11 +285,11 @@ bool PickFirst::PickLocked(PickState* pick, grpc_error** error) { "No pick result available but synchronous result required."); return true; } + pick->next = pending_picks_; + pending_picks_ = pick; if (!started_picking_) { StartPickingLocked(); } - pick->next = pending_picks_; - pending_picks_ = pick; return false; } @@ -570,15 +570,6 @@ void PickFirst::PickFirstSubchannelData::ProcessConnectivityChangeLocked( void PickFirst::PickFirstSubchannelData::ProcessUnselectedReadyLocked() { PickFirst* p = static_cast(subchannel_list()->policy()); - if (p->selected_ == this) { - if (grpc_lb_pick_first_trace.enabled()) { - gpr_log(GPR_ERROR, - "Pick First %p calling ProcessUnselectedReadyLocked() on " - "selected subchannel %p", - p, subchannel()); - } - 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