diff options
| author |  David G. Quintas <dgq@google.com> | 2016-09-28 09:42:46 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-09-28 09:42:46 -0700 |
| commit | 8d7cab603e4a603a9cfa62f348688975b5d09bc4 (patch) | |
| tree | 7673980d41d5dd3135e6edc2c0120dfbe405427d /src/core | |
| parent | 7ab8eecdc9c0c2b1ebb2e69d7460bebca774ebd9 (diff) | |
| parent | d8bf8e2525adeb8b4ae2108cd022e167e5fb8545 (diff) | |
Merge pull request #8183 from dgquintas/grpclb_deadline
Changed deadline of internal LB channel.
Diffstat (limited to 'src/core')
| -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 8105c4415d..f45cff1a17 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -926,10 +926,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 |