From 663f50c658b6f13dedac5541f8a0789257225a69 Mon Sep 17 00:00:00 2001 From: Juanli Shen Date: Thu, 5 Oct 2017 14:36:13 -0700 Subject: Cancel fallback timer in glb_shutdown() --- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc | 4 ++++ 1 file changed, 4 insertions(+) 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; -- cgit v1.2.3