diff options
author | Mark D. Roth <roth@google.com> | 2018-12-04 09:01:35 -0800 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2018-12-06 09:21:21 -0800 |
commit | 5f806d77dc9ddf0b3bec066bf71ff6dc76a6e504 (patch) | |
tree | 52c2b07f8f4d89500c3df68ef6c37bc84a264d29 /src/core/ext | |
parent | c3b1047e3089bb79d907910b652694c6622801b9 (diff) |
Fix bug in subchannel backoff reset code.
Diffstat (limited to 'src/core/ext')
-rw-r--r-- | src/core/ext/filters/client_channel/subchannel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 0817b1dd39..4d98b63b49 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -887,12 +887,12 @@ static void on_subchannel_connected(void* arg, grpc_error* error) { void grpc_subchannel_reset_backoff(grpc_subchannel* subchannel) { gpr_mu_lock(&subchannel->mu); + subchannel->backoff->Reset(); if (subchannel->have_alarm) { subchannel->deferred_reset_backoff = true; grpc_timer_cancel(&subchannel->alarm); } else { subchannel->backoff_begun = false; - subchannel->backoff->Reset(); maybe_start_connecting_locked(subchannel); } gpr_mu_unlock(&subchannel->mu); |