diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-28 13:20:15 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-28 13:20:15 -0700 |
| commit | 56e470e04739e64efc6791099f64a99fe6a3be7f (patch) | |
| tree | d260e598bc9590376d674c2d871172c0d13d97c5 /src/core/ext/lb_policy/grpclb/grpclb.c | |
| parent | 996e95b4ad4e401dc8b04ae9cc092bd167307e10 (diff) | |
| parent | b97f867b390193daf18988958183143726602727 (diff) | |
Merge remote-tracking branch 'upstream/master' into service_config
Diffstat (limited to 'src/core/ext/lb_policy/grpclb/grpclb.c')
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/grpclb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c index d81f8e27ea..cda518394f 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -939,10 +939,8 @@ static lb_client_data *lb_client_data_create(glb_lb_policy *glb_policy) { grpc_closure_init(&lb_client->close_sent, close_sent_cb, lb_client); grpc_closure_init(&lb_client->srv_status_rcvd, srv_status_rcvd_cb, lb_client); - /* TODO(dgq): get the deadline from the client config instead of fabricating - * one here. */ - lb_client->deadline = gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), - gpr_time_from_seconds(3, GPR_TIMESPAN)); + /* TODO(dgq): get the deadline from the parent channel. */ + lb_client->deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); /* Note the following LB call progresses every time there's activity in \a * glb_policy->base.interested_parties, which is comprised of the polling |