Merge pull request #8114 from dgquintas/rr_user_data_fix

Round Robin user_data fix
pull/8120/head
David G. Quintas 8 years ago committed by GitHub
commit d2f7268bc7
  1. 5
      src/core/ext/lb_policy/round_robin/round_robin.c

@ -404,7 +404,10 @@ static int rr_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
/* readily available, report right away */ /* readily available, report right away */
gpr_mu_unlock(&p->mu); gpr_mu_unlock(&p->mu);
*target = grpc_subchannel_get_connected_subchannel(selected->subchannel); *target = grpc_subchannel_get_connected_subchannel(selected->subchannel);
if (user_data != NULL) {
*user_data = selected->user_data; *user_data = selected->user_data;
}
if (grpc_lb_round_robin_trace) { if (grpc_lb_round_robin_trace) {
gpr_log(GPR_DEBUG, gpr_log(GPR_DEBUG,
"[RR PICK] TARGET <-- CONNECTED SUBCHANNEL %p (NODE %p)", "[RR PICK] TARGET <-- CONNECTED SUBCHANNEL %p (NODE %p)",
@ -470,7 +473,9 @@ static void rr_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
*pp->target = *pp->target =
grpc_subchannel_get_connected_subchannel(selected->subchannel); grpc_subchannel_get_connected_subchannel(selected->subchannel);
if (pp->user_data != NULL) {
*pp->user_data = selected->user_data; *pp->user_data = selected->user_data;
}
if (grpc_lb_round_robin_trace) { if (grpc_lb_round_robin_trace) {
gpr_log(GPR_DEBUG, gpr_log(GPR_DEBUG,
"[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)", "[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)",

Loading…
Cancel
Save