Fix close vs. cancel confusion in transport helper functions.

src/core/lib/channel/channel_stack.c

@@ -288,3 +288,13 @@ void grpc_call_element_send_cancel_with_message(grpc_exec_ctx *exec_ctx,
                                                          optional_message);
   elem->filter->start_transport_stream_op(exec_ctx, elem, &op);
 }
+
+void grpc_call_element_send_close_with_message(grpc_exec_ctx *exec_ctx,
+                                               grpc_call_element *elem,
+                                               grpc_status_code status,
+                                               gpr_slice *optional_message) {
+  grpc_transport_stream_op op;
+  memset(&op, 0, sizeof(op));
+  grpc_transport_stream_op_add_close(&op, status, optional_message);
+  elem->filter->start_transport_stream_op(exec_ctx, elem, &op);
+}

src/core/lib/channel/channel_stack.h

@@ -290,6 +290,11 @@ void grpc_call_element_send_cancel_with_message(grpc_exec_ctx *exec_ctx,
                                                 grpc_status_code status,
                                                 gpr_slice *optional_message);
 
+void grpc_call_element_send_close_with_message(grpc_exec_ctx *exec_ctx,
+                                               grpc_call_element *cur_elem,
+                                               grpc_status_code status,
+                                               gpr_slice *optional_message);
+
 extern int grpc_trace_channel;
 
 #define GRPC_CALL_LOG_OP(sev, elem, op) \

src/core/lib/channel/deadline_filter.c

@@ -55,15 +55,11 @@ gpr_log(GPR_INFO, "==> %s(), is_client=%d", __func__, deadline_state->is_client)
   gpr_mu_unlock(&deadline_state->timer_mu);
   if (error != GRPC_ERROR_CANCELLED) {
 gpr_log(GPR_INFO, "DEADLINE_EXCEEDED");
-// FIXME: change grpc_call_element_send_cancel_with_message to not call close
+    gpr_slice msg = gpr_slice_from_static_string("Deadline Exceeded");
-//    grpc_call_element_send_cancel(exec_ctx, elem);
+    grpc_call_element_send_cancel_with_message(exec_ctx, elem,
-    grpc_transport_stream_op op;
+                                               GRPC_STATUS_DEADLINE_EXCEEDED,
-    memset(&op, 0, sizeof(op));
+                                               &msg);
-    op.cancel_error = grpc_error_set_int(
+    gpr_slice_unref(msg);
-        GRPC_ERROR_CREATE("Deadline Exceeded"),
-        GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_DEADLINE_EXCEEDED);
-    elem->filter->start_transport_stream_op(exec_ctx, elem, &op);
-    GRPC_ERROR_UNREF(op.cancel_error);
   }
   GRPC_CALL_STACK_UNREF(exec_ctx, deadline_state->call_stack, "deadline_timer");
 }

src/core/lib/channel/http_client_filter.c

@@ -103,7 +103,7 @@ static grpc_mdelem *client_recv_filter(void *user_data, grpc_mdelem *md) {
                  grpc_mdstr_as_c_string(md->value));
     gpr_slice message = gpr_slice_from_copied_string(message_string);
     gpr_free(message_string);
-    grpc_call_element_send_cancel_with_message(a->exec_ctx, a->elem,
+    grpc_call_element_send_close_with_message(a->exec_ctx, a->elem,
                                               GRPC_STATUS_CANCELLED, &message);
     return NULL;
   } else if (md == GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC) {

src/core/lib/transport/transport.c

@@ -220,11 +220,7 @@ void grpc_transport_stream_op_add_cancellation_with_message(
     error = GRPC_ERROR_CREATE("Call cancelled");
   }
   error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, status);
-  // TODO(ctiller): We are intentionally setting close_error instead of
+  add_error(op, &op->cancel_error, error);
-  // cancel_error here.  This is an ugly hack and should be replaced
-  // by a more general-purpose mechanism that allows us to control
-  // cancel/close behavior.
-  add_error(op, &op->close_error, error);
 }
 
 void grpc_transport_stream_op_add_close(grpc_transport_stream_op *op,