diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-10-03 14:30:03 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-10-03 14:30:03 -0700 |
| commit | 5cf3c372ddafee6ee907e2b709e907d1dcd17f51 (patch) | |
| tree | 2ac46438eda0e7ef58c2288dfe9c871d278dbbe1 /src/core/ext/lb_policy/grpclb | |
| parent | 6909922fdf504167dcf89c521eaf374a62705e20 (diff) | |
Back to using inf future lor LB call deadline
Diffstat (limited to 'src/core/ext/lb_policy/grpclb')
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/grpclb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c index 76cc08ecc9..63af774ea6 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -275,7 +275,7 @@ typedef struct glb_lb_policy { const char *server_name; grpc_client_channel_factory *cc_factory; - /** deadline for the original client's call */ + /** deadline for the LB's call */ gpr_timespec deadline; /** for communicating with the LB server */ @@ -766,10 +766,7 @@ static int glb_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, glb_lb_policy *glb_policy = (glb_lb_policy *)pol; gpr_mu_lock(&glb_policy->mu); - /* use the longest deadline across incoming calls for the communication with - * the LB server */ - glb_policy->deadline = - gpr_time_max(pick_args->deadline, glb_policy->deadline); + glb_policy->deadline = pick_args->deadline; bool pick_done; if (glb_policy->rr_policy != NULL) { @@ -930,7 +927,6 @@ 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); - /* the longest deadline across incoming calls */ lb_client->deadline = glb_policy->deadline; /* Note the following LB call progresses every time there's activity in \a |