diff options
| author |  Juanli Shen <aspirinsjl@gmail.com> | 2018-11-09 14:23:08 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-11-09 14:23:08 -0800 |
| commit | 2b568d2027091f9aa2858db98f128dbf5ae60330 (patch) | |
| tree | 4fe380e3ddcf087b2a29811966bec46f9d66c39e /src/core/ext/filters | |
| parent | d0ad7518ba2a015f9b535ab7a9fea2f650cb5762 (diff) | |
| parent | 2eff247b74a9fb906d276e0621fc40cc76193ebb (diff) | |
Merge pull request #17131 from AspirinSJL/grpclb_fallback_fix
Update the RR policy even when fallback mode is disabled
Diffstat (limited to 'src/core/ext/filters')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc | 7 |
1 files changed, 2 insertions, 5 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 17e0d26875..dbb90b438c 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 @@ -1333,11 +1333,8 @@ void GrpcLb::ProcessChannelArgsLocked(const grpc_channel_args& args) { void GrpcLb::UpdateLocked(const grpc_channel_args& args) { ProcessChannelArgsLocked(args); - // If fallback is configured and the RR policy already exists, update - // it with the new fallback addresses. - if (lb_fallback_timeout_ms_ > 0 && rr_policy_ != nullptr) { - CreateOrUpdateRoundRobinPolicyLocked(); - } + // Update the existing RR policy. + if (rr_policy_ != nullptr) CreateOrUpdateRoundRobinPolicyLocked(); // Start watching the LB channel connectivity for connection, if not // already doing so. if (!watching_lb_channel_) { |