pull/4238/head
Craig Tiller 9 years ago
parent d27c78db09
commit 093193edb7
  1. 7
      src/core/client_config/lb_policies/pick_first.c
  2. 2
      templates/test/core/end2end/end2end_defs.include
  3. 2
      test/core/end2end/end2end_nosec_tests.c
  4. 2
      test/core/end2end/end2end_tests.c

@ -368,13 +368,12 @@ void pf_notify_on_state_change(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
void pf_ping_one(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
grpc_closure *closure) {
pick_first_lb_policy *p = (pick_first_lb_policy *)pol;
gpr_mu_lock(&p->mu);
if (p->selected) {
grpc_connected_subchannel_ping(exec_ctx, p->selected, closure);
grpc_connected_subchannel *selected = GET_SELECTED(p);
if (selected) {
grpc_connected_subchannel_ping(exec_ctx, selected, closure);
} else {
grpc_exec_ctx_enqueue(exec_ctx, closure, 0);
}
gpr_mu_unlock(&p->mu);
}
static const grpc_lb_policy_vtable pick_first_lb_policy_vtable = {

@ -61,7 +61,7 @@ void grpc_end2end_tests(int argc, char **argv,
continue;
}
% endfor
gpr_log(GPR_DEBUG, "not a test: '%%s'", argv[i]);
gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]);
abort();
}
}</%def>

@ -259,7 +259,7 @@ void grpc_end2end_tests(int argc, char **argv,
trailing_metadata(config);
continue;
}
gpr_log(GPR_DEBUG, "not a test: '%%s'", argv[i]);
gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]);
abort();
}
}

@ -265,7 +265,7 @@ void grpc_end2end_tests(int argc, char **argv,
trailing_metadata(config);
continue;
}
gpr_log(GPR_DEBUG, "not a test: '%%s'", argv[i]);
gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]);
abort();
}
}

Loading…
Cancel
Save