aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext/filters/client_channel/lb_policy/grpclb
diff options
context:
space:
mode:
authorGravatar Juanli Shen <juanlishen@google.com>2017-10-05 14:36:13 -0700
committerGravatar Juanli Shen <juanlishen@google.com>2017-10-05 14:36:13 -0700
commit663f50c658b6f13dedac5541f8a0789257225a69 (patch)
treea71436e2f0639fe479becbf064e0db986ecd39eb /src/core/ext/filters/client_channel/lb_policy/grpclb
parentc277fc0818eb2e7408db6758c9690bb4eb2c6ff7 (diff)
Cancel fallback timer in glb_shutdown()
Diffstat (limited to 'src/core/ext/filters/client_channel/lb_policy/grpclb')
-rw-r--r--src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc4
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;