aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar David G. Quintas <dgq@google.com>2017-07-28 11:00:18 -0700
committerGravatar GitHub <noreply@github.com>2017-07-28 11:00:18 -0700
commitaaf623ac66869f4bdcc4d9c3dcd859035df89dd9 (patch)
treeb1ed563d0e5d4f5519dd7d0fcc02e6f1b441993f /src
parent8dc1b7db51c49869ab24404bc810500db51fc86d (diff)
parent6a7935e14e6500d94e52b4dd5b049fa236eba7e0 (diff)
Merge pull request #11965 from dgquintas/grpclb_lb_channel_conn_state_subscription
Watch the LB channel using the right initial conn. state
Diffstat (limited to 'src')
-rw-r--r--src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c
index f248a873ba..3d76aaac02 100644
--- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c
+++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c
@@ -1772,7 +1772,8 @@ static void glb_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy,
if (!glb_policy->watching_lb_channel) {
// Watch the LB channel connectivity for connection.
- glb_policy->lb_channel_connectivity = GRPC_CHANNEL_INIT;
+ glb_policy->lb_channel_connectivity = grpc_channel_check_connectivity_state(
+ glb_policy->lb_channel, true /* try to connect */);
grpc_channel_element *client_channel_elem = grpc_channel_stack_last_element(
grpc_channel_get_channel_stack(glb_policy->lb_channel));
GPR_ASSERT(client_channel_elem->filter == &grpc_client_channel_filter);