diff options
author | Mark D. Roth <roth@google.com> | 2016-09-28 12:50:30 -0700 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2016-09-28 12:50:30 -0700 |
commit | 25e229df095b68636a553f3bdbf9431c8e8cf5bb (patch) | |
tree | ef5fe8cb582d6bd95a024764542a3cf072cbc3e0 /src/core/ext/lb_policy/grpclb/grpclb.c | |
parent | 1a2e6ac10dbdb3984b4f651ffb042a22269e26c5 (diff) | |
parent | 9fce8e13b3b83756a1658472aafa1cff4a97880d (diff) |
Merge remote-tracking branch 'upstream/master' into deadline_filter
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 5bbca1b3a1..0050489425 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -934,10 +934,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 |