diff options
| author |  Juanli Shen <aspirinsjl@gmail.com> | 2017-10-06 09:24:22 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-06 09:24:22 -0700 |
| commit | 12f38b8ecc112d46f372f4c20e0d47a365a43a7e (patch) | |
| tree | 427fa6d4f2a834f9d0be52d1e9137c4bce998298 | |
| parent | d059e1c43ced2279ea4594df04f62761d7b95a86 (diff) | |
| parent | 663f50c658b6f13dedac5541f8a0789257225a69 (diff) | |
Merge pull request #12851 from AspirinSJL/cancel_fallback_timer
Cancel fallback timer in glb_shutdown()
| -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 d8e314d1f9..773ae29e41 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; |