diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-06 10:27:33 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-06 10:27:33 -0700 |
| commit | c5f7b882b48b33edc0395155c1b2ad4882b10868 (patch) | |
| tree | c6b9fee879a092f4e9a7fb37b7c93f69bde5b90c /src/core/ext/filters/client_channel/lb_policy/grpclb | |
| parent | abecd39477e901ad060300a5df67e87469ddbb54 (diff) | |
| parent | 1b11c745417dc54ccc31bba4cdfb2adb02c09ab9 (diff) | |
Merge github.com:grpc/grpc into flowctl+millis
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.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; |