diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-06 13:16:08 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-06 13:16:08 -0700 |
| commit | e08e39d14811c51334151ca43b40764a70380e23 (patch) | |
| tree | 2b14caea98ad852fc37cc6cd391e3546ac98d014 /src/core | |
| parent | a69912cb2c7abae2d930c4158bd56c33b9b7b898 (diff) | |
| parent | 3640b4084ac8485ef99ab3162cae7b8b079bbf6b (diff) | |
Merge github.com:grpc/grpc into qps_failya
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 02a983c63c..53fa0fff04 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -1010,6 +1010,10 @@ static void glb_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); glb_policy->retry_timer_active = false; } + if (glb_policy->fallback_timer_active) { + grpc_timer_cancel(exec_ctx, &glb_policy->lb_fallback_timer); + glb_policy->fallback_timer_active = false; + } pending_pick *pp = glb_policy->pending_picks; glb_policy->pending_picks = NULL; |