diff options
| author |  Noah Eisen <ncteisen@google.com> | 2017-11-14 14:00:25 -0800 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2017-11-14 14:00:25 -0800 |
| commit | e092ff879ea2f554956c0bc2bc063a85f7fa6866 (patch) | |
| tree | 53ae2d874c03ff8e09ee3d405f799a4eea718e26 /src/core/ext/filters/client_channel/lb_policy | |
| parent | d9d5c8f100b0f9b7bcbba2480d85053cf6ccbf88 (diff) | |
| parent | 0c7e70d69ccef4105049ce82dffaa17d20942043 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into tracing++
Diffstat (limited to 'src/core/ext/filters/client_channel/lb_policy')
| -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 f863bb9479..e64ba53604 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); } |