diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-07-11 17:58:47 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-11 17:58:47 -0700 |
| commit | 2b98c8838d2035296b9cb016fc9af2bb8a987d90 (patch) | |
| tree | 51e00ccbe44588257a5010a13f1549f5c782c1f1 /src/core/lib/surface | |
| parent | 8c18b4abccf3fec3c8f377fac8a638e729c0de26 (diff) | |
| parent | 9a5b4348f843c567185d9fa36d189a1df1ab617b (diff) | |
Merge pull request #7291 from ctiller/better_status
Make it more likely to correctly report deadline exceeded
Diffstat (limited to 'src/core/lib/surface')
| -rw-r--r-- | src/core/lib/surface/call.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c index e5668be47f..fc9df76dc1 100644 --- a/src/core/lib/surface/call.c +++ b/src/core/lib/surface/call.c @@ -259,7 +259,8 @@ grpc_call *grpc_call_create( call->metadata_batch[i][j].deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); } } - call->send_deadline = send_deadline; + call->send_deadline = + gpr_convert_clock_type(send_deadline, GPR_CLOCK_MONOTONIC); GRPC_CHANNEL_INTERNAL_REF(channel, "call"); /* initial refcount dropped by grpc_call_destroy */ grpc_call_stack_init(&exec_ctx, channel_stack, 1, destroy_call, call, |