diff options
| author |  David G. Quintas <dgq@google.com> | 2017-11-14 17:55:43 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-14 17:55:43 +0100 |
| commit | 38107493cd0150bed33d3a8472cc8700b7de8a21 (patch) | |
| tree | 1c2f8c46509b7d02cd169cb1a8a4aa7069e8ace7 /src | |
| parent | 4ed062561c3f86aa087865c8ead4c3fe81303bee (diff) | |
| parent | 3f69cb3dc31d800bb278871100a2ac34d2b5a8a5 (diff) | |
Merge pull request #13339 from dgquintas/client_stats_fallback_kaput
grpclb: Don't go into fallback if we haven't started picking
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc | 2 |
1 files changed, 1 insertions, 1 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 e9bef8a921..040941a34d 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 @@ -1751,7 +1751,7 @@ static void fallback_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_addresses_destroy(exec_ctx, glb_policy->fallback_backend_addresses); glb_policy->fallback_backend_addresses = extract_backend_addresses_locked(exec_ctx, addresses); - if (glb_policy->lb_fallback_timeout_ms > 0 && + if (glb_policy->started_picking && glb_policy->lb_fallback_timeout_ms > 0 && !glb_policy->fallback_timer_active) { rr_handover_locked(exec_ctx, glb_policy); } |