aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext/filters/client_channel
diff options
context:
space:
mode:
authorGravatar David G. Quintas <dgq@google.com>2018-07-11 17:10:56 -0700
committerGravatar GitHub <noreply@github.com>2018-07-11 17:10:56 -0700
commitea75af5e972055515bfbab93b2e0d4b48a9d3268 (patch)
tree94c3484590a4dfa4188e71155343167fab0b1382 /src/core/ext/filters/client_channel
parentf2cd616329ba5973ac1834f60bab65de7e7fdeaa (diff)
parent8427571d0602899591405b6fd4b7e9da96e47b14 (diff)
Merge pull request #15947 from dgquintas/rr_ppicks_fix
Fixed ordering in adding pending picks to RR
Diffstat (limited to 'src/core/ext/filters/client_channel')
-rw-r--r--src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
index b177385065..42e8e88ec9 100644
--- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
@@ -354,11 +354,11 @@ bool RoundRobin::PickLocked(PickState* pick) {
if (DoPickLocked(pick)) return true;
}
/* no pick currently available. Save for later in list of pending picks */
+ pick->next = pending_picks_;
+ pending_picks_ = pick;
if (!started_picking_) {
StartPickingLocked();
}
- pick->next = pending_picks_;
- pending_picks_ = pick;
return false;
}