Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do the Step() in the right place

Browse Source
reviewable/pr13494/r12
David Garcia Quintas 7 years ago
parent fa4126f0cb
commit a5e2da4096
1 changed files with 1 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/core/ext/filters/client_channel/subchannel.cc

3
src/core/ext/filters/client_channel/subchannel.cc
Unescape View File

@ -402,10 +402,8 @@ static void continue_connect_locked(grpc_exec_ctx* exec_ctx,
args.interested_parties = c->pollset_set; args.interested_parties = c->pollset_set;
const grpc_millis min_deadline = const grpc_millis min_deadline =
(c->min_connect_timeout_ms * 1000) + grpc_exec_ctx_now(exec_ctx); (c->min_connect_timeout_ms * 1000) + grpc_exec_ctx_now(exec_ctx);
c->next_attempt_deadline = c->backoff->Step(exec_ctx);
args.deadline = std::max(c->next_attempt_deadline, min_deadline); args.deadline = std::max(c->next_attempt_deadline, min_deadline);
args.channel_args = c->args; args.channel_args = c->args;
grpc_connectivity_state_set(exec_ctx, &c->state_tracker, grpc_connectivity_state_set(exec_ctx, &c->state_tracker,
GRPC_CHANNEL_CONNECTING, GRPC_ERROR_NONE, GRPC_CHANNEL_CONNECTING, GRPC_ERROR_NONE,
"state_change"); "state_change");
@ -451,6 +449,7 @@ static void on_alarm(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {
} }
if (error == GRPC_ERROR_NONE) { if (error == GRPC_ERROR_NONE) {
gpr_log(GPR_INFO, "Failed to connect to channel, retrying"); gpr_log(GPR_INFO, "Failed to connect to channel, retrying");
c->next_attempt_deadline = c->backoff->Step(exec_ctx);
continue_connect_locked(exec_ctx, c); continue_connect_locked(exec_ctx, c);
gpr_mu_unlock(&c->mu); gpr_mu_unlock(&c->mu);
} else { } else {

Write Preview
Loading…
Cancel
Save