diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-17 09:02:44 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-17 09:02:44 -0700 |
| commit | 095a220acb68365a39a7c711d6d244827d080d08 (patch) | |
| tree | 6242df75424c1fc707f6cb417ee23eed660ea0df | |
| parent | 90224ba893324fad358934eb2a4487e33c6a3baf (diff) | |
Stop setting deadline on server requests, assert so that this never happens again
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 13 | ||||
| -rw-r--r-- | src/core/lib/surface/call.c | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index fb8ceaecb0..c70efec217 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -1492,6 +1492,19 @@ static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; + if (!t->is_client) { + if (op->send_initial_metadata) { + GPR_ASSERT(0 == gpr_time_cmp(gpr_inf_future(GPR_CLOCK_MONOTONIC), + op->payload->send_initial_metadata + .send_initial_metadata->deadline)); + } + if (op->send_trailing_metadata) { + GPR_ASSERT(0 == gpr_time_cmp(gpr_inf_future(GPR_CLOCK_MONOTONIC), + op->payload->send_trailing_metadata + .send_trailing_metadata->deadline)); + } + } + if (GRPC_TRACER_ON(grpc_http_trace)) { char *str = grpc_transport_stream_op_batch_string(op); gpr_log(GPR_DEBUG, "perform_stream_op[s=%p]: %s", s, str); diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c index 201969cd45..4e220bb467 100644 --- a/src/core/lib/surface/call.c +++ b/src/core/lib/surface/call.c @@ -1531,7 +1531,9 @@ static grpc_call_error call_start_batch(grpc_exec_ctx *exec_ctx, goto done_with_error; } /* TODO(ctiller): just make these the same variable? */ - call->metadata_batch[0][0].deadline = call->send_deadline; + if (call->is_client) { + call->metadata_batch[0][0].deadline = call->send_deadline; + } stream_op_payload->send_initial_metadata.send_initial_metadata = &call->metadata_batch[0 /* is_receiving */][0 /* is_trailing */]; stream_op_payload->send_initial_metadata.send_initial_metadata_flags = |