diff options
author | 2017-11-10 12:05:03 -0800 | |
---|---|---|
committer | 2017-11-10 12:05:03 -0800 | |
commit | 5cce8cf2c3528c2b016de9f6b0b86894a855aac8 (patch) | |
tree | cfcfd26ed345e133a901bc7029a82dee7e81c877 /src/core | |
parent | a6465d124c44b924bdc094675c3fd22b8c843da8 (diff) | |
parent | 9fbd6c1c635c48a183455c4332f292c0ef49d11a (diff) |
Merge master
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc | 4 |
1 files changed, 2 insertions, 2 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 14a1a08971..193bd766f3 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 @@ -1236,12 +1236,12 @@ static void glb_notify_on_state_change_locked(grpc_lb_policy* pol, static void lb_call_on_retry_timer_locked(void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; glb_policy->retry_timer_active = false; - if (!glb_policy->shutting_down && error == GRPC_ERROR_NONE) { + if (!glb_policy->shutting_down && glb_policy->lb_call == NULL && + error == GRPC_ERROR_NONE) { if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_INFO, "Restaring call to LB server (grpclb %p)", (void*)glb_policy); } - GPR_ASSERT(glb_policy->lb_call == NULL); query_for_backends_locked(glb_policy); } GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "grpclb_retry_timer"); |