diff options
| author |  Juanli Shen <aspirinsjl@gmail.com> | 2018-11-13 09:30:28 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-11-13 09:30:28 -0800 |
| commit | 1a4286df98e44d69aac07fa6dc93f49efed3311d (patch) | |
| tree | 4ba6c4c63923a6361cfa54dc176470c07498702b | |
| parent | ea56b5f61e9fa8b03236f3f3a463603685b1e807 (diff) | |
| parent | ec4892b316d97fd7e3884a376a643ca620de04a1 (diff) | |
Merge pull request #17196 from AspirinSJL/revert_lb_update
Revert RR policy update in xDS
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/xds/xds.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc index 59923ab861..a65c949ca0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc +++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc @@ -1321,10 +1321,12 @@ void XdsLb::ProcessChannelArgsLocked(const grpc_channel_args& args) { void XdsLb::UpdateLocked(const grpc_channel_args& args) { ProcessChannelArgsLocked(args); - // Note: We have disabled fallback mode in the code, so we don't need to - // handle fallback address changes. + // Update the existing RR policy. + // Note: We have disabled fallback mode in the code, so this RR policy must + // have been created from a serverlist. // TODO(vpowar): Handle the fallback_address changes when we add support for // fallback in xDS. + if (rr_policy_ != nullptr) CreateOrUpdateRoundRobinPolicyLocked(); // Start watching the LB channel connectivity for connection, if not // already doing so. if (!watching_lb_channel_) { |