natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stress test fixes 

- properly fail a Read() on a stream if we fail to parse a protobuf
- fix an ordering problem with the chttp2 transport global lock, whereby
  a sequence of two operations could be swapped - this resulted in
  slices being returned to the upper layers in the wrong order,
  corrupting data
This commit is contained in:
Craig Tiller 2016-04-29 16:47:27 -07:00
parent 90b4a87d3b
commit 4ee1a62723
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/grpc++/impl/codegen/call.h
View File

@ -281,10 +281,9 @@ class CallOpRecvMessage {
if (message_ == nullptr) return;
if (recv_buf_) {
if (*status) {
got_message = true;
*status = SerializationTraits<R>::Deserialize(recv_buf_, message_,
max_message_size)
.ok();
got_message = *status = SerializationTraits<R>::Deserialize(
recv_buf_, message_, max_message_size)
.ok();
} else {
got_message = false;
g_core_codegen_interface->grpc_byte_buffer_destroy(recv_buf_);

17
src/core/ext/transport/chttp2/transport/chttp2_transport.c
View File

@ -629,9 +629,10 @@ static void finish_global_actions(grpc_exec_ctx *exec_ctx,
check_read_ops(exec_ctx, &t->global);
gpr_mu_lock(&t->executor.mu);
if (t->executor.pending_actions != NULL) {
hdr = t->executor.pending_actions;
t->executor.pending_actions = NULL;
if (t->executor.pending_actions_head != NULL) {
hdr = t->executor.pending_actions_head;
t->executor.pending_actions_head = t->executor.pending_actions_tail =
NULL;
gpr_mu_unlock(&t->executor.mu);
while (hdr != NULL) {
hdr->action(exec_ctx, t, hdr->stream, hdr->arg);
@ -686,8 +687,14 @@ void grpc_chttp2_run_with_global_lock(grpc_exec_ctx *exec_ctx,
gpr_free(hdr);
continue;
}
hdr->next = t->executor.pending_actions;
t->executor.pending_actions = hdr;
hdr->next = NULL;
if (t->executor.pending_actions_head != NULL) {
t->executor.pending_actions_tail =
t->executor.pending_actions_tail->next = hdr;
} else {
t->executor.pending_actions_tail = t->executor.pending_actions_head =
hdr;
}
REF_TRANSPORT(t, "pending_action");
gpr_mu_unlock(&t->executor.mu);
}

3
src/core/ext/transport/chttp2/transport/internal.h
View File

@ -321,7 +321,8 @@ struct grpc_chttp2_transport {
/** is a thread currently parsing */
bool parsing_active;
grpc_chttp2_executor_action_header *pending_actions;
grpc_chttp2_executor_action_header *pending_actions_head;
grpc_chttp2_executor_action_header *pending_actions_tail;
} executor;
/** is the transport destroying itself? */