aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext/filters/client_channel
diff options
context:
space:
mode:
authorGravatar Juanli Shen <juanlishen@google.com>2018-11-12 16:05:47 -0800
committerGravatar Juanli Shen <juanlishen@google.com>2018-11-12 16:05:57 -0800
commitec4892b316d97fd7e3884a376a643ca620de04a1 (patch)
treee26ce3cc5bcb4a1c6e76999308ecb9b0be78472f /src/core/ext/filters/client_channel
parent37f87651114f52868cafa8fdd2d7d622784b568c (diff)
Revert RR policy update in xDS
Diffstat (limited to 'src/core/ext/filters/client_channel')
-rw-r--r--src/core/ext/filters/client_channel/lb_policy/xds/xds.cc6
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_) {