diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-04 22:02:47 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-04 22:02:47 +0000 |
| commit | 62800f789cd407805c24850df23ef45939d20d16 (patch) | |
| tree | c3cbe2c8615e4c8a731d364042b9a11bf02e408b /src/core/ext | |
| parent | bc7c224cac5cebc7b8cef0c6b14151f237eef8dd (diff) | |
| parent | f31a80eac3fc507060f33c651bb13a6c3eaffab7 (diff) | |
Merge github.com:grpc/grpc into timer_pool
Diffstat (limited to 'src/core/ext')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c | 12 | ||||
| -rw-r--r-- | src/core/ext/transport/cronet/transport/cronet_transport.c | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c index cdec7a1a02..b7c0e929b7 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c @@ -917,8 +917,8 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx, GPR_ASSERT(glb_policy->cc_factory != NULL); arg = grpc_channel_args_find(args->args, GRPC_ARG_GRPCLB_CALL_TIMEOUT_MS); - glb_policy->lb_call_timeout_ms = grpc_channel_arg_get_integer( - arg, (grpc_integer_options){0, 0, INT_MAX}); + glb_policy->lb_call_timeout_ms = + grpc_channel_arg_get_integer(arg, (grpc_integer_options){0, 0, INT_MAX}); // Make sure that GRPC_ARG_LB_POLICY_NAME is set in channel args, // since we use this to trigger the client_load_reporting filter. @@ -1279,10 +1279,10 @@ static void lb_call_init_locked(grpc_exec_ctx *exec_ctx, grpc_slice host = grpc_slice_from_copied_string(glb_policy->server_name); gpr_timespec deadline = glb_policy->lb_call_timeout_ms == 0 - ? gpr_inf_future(GPR_CLOCK_MONOTONIC) - : gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), - gpr_time_from_millis(glb_policy->lb_call_timeout_ms, - GPR_TIMESPAN)); + ? gpr_inf_future(GPR_CLOCK_MONOTONIC) + : gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), + gpr_time_from_millis(glb_policy->lb_call_timeout_ms, + GPR_TIMESPAN)); glb_policy->lb_call = grpc_channel_create_pollset_set_call( exec_ctx, glb_policy->lb_channel, NULL, GRPC_PROPAGATE_DEFAULTS, glb_policy->base.interested_parties, diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.c b/src/core/ext/transport/cronet/transport/cronet_transport.c index d4e89d6a6c..67974b0b6a 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.c +++ b/src/core/ext/transport/cronet/transport/cronet_transport.c @@ -886,6 +886,10 @@ static bool op_can_be_run(grpc_transport_stream_op_batch *curr_op, !stream_state->state_op_done[OP_RECV_MESSAGE]) { CRONET_LOG(GPR_DEBUG, "Because"); result = false; + } else if (curr_op->cancel_stream && + !stream_state->state_callback_received[OP_CANCELED]) { + CRONET_LOG(GPR_DEBUG, "Because"); + result = false; } else if (curr_op->recv_trailing_metadata) { /* We aren't done with trailing metadata yet */ if (!stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { |