Get trailing metadata working again, remove debug spam

src/core/ext/transport/chttp2/transport/chttp2_transport.c

@@ -720,8 +720,6 @@ static void maybe_start_some_streams(grpc_exec_ctx *exec_ctx,
 #define CLOSURE_BARRIER_FIRST_REF_BIT (1 << 16)
 
 static grpc_closure *add_closure_barrier(grpc_closure *closure) {
-  gpr_log(GPR_DEBUG, "add_closure_barrier[%p]: scratch=%" PRIdPTR, closure,
-          closure->next_data.scratch);
   closure->next_data.scratch += CLOSURE_BARRIER_FIRST_REF_BIT;
   return closure;
 }
@@ -736,8 +734,6 @@ void grpc_chttp2_complete_closure_step(grpc_exec_ctx *exec_ctx,
     GRPC_ERROR_UNREF(error);
     return;
   }
-  gpr_log(GPR_DEBUG, "complete_closure_step[%p]: scratch=%" PRIdPTR, closure,
-          closure->next_data.scratch);
   closure->next_data.scratch -= CLOSURE_BARRIER_FIRST_REF_BIT;
   if (error != GRPC_ERROR_NONE) {
     if (closure->error == GRPC_ERROR_NONE) {

src/core/ext/transport/chttp2/transport/writing.c

@@ -77,13 +77,6 @@ bool grpc_chttp2_begin_write(grpc_exec_ctx *exec_ctx,
 
   GPR_TIMER_BEGIN("grpc_chttp2_begin_write", 0);
 
-  gpr_log(
-      GPR_DEBUG,
-      "grpc_chttp2_begin_write: outbuf_len0=%" PRIdPTR
-      " dirtied_local_settings=%d sent_local_settings=%d qbuf_len=%" PRIdPTR,
-      t->outbuf.length, t->dirtied_local_settings, t->sent_local_settings,
-      t->qbuf.length);
-
   if (t->dirtied_local_settings && !t->sent_local_settings) {
     gpr_slice_buffer_add(
         &t->outbuf,
@@ -116,14 +109,6 @@ bool grpc_chttp2_begin_write(grpc_exec_ctx *exec_ctx,
     bool sent_initial_metadata = s->sent_initial_metadata;
     bool now_writing = false;
 
-    gpr_log(GPR_DEBUG,
-            "grpc_chttp2_begin_write[%d]: sent_initial_metadata=%d "
-            "send_initial_metadata=%p announce_window=%d fcbuf_len=%" PRIdPTR
-            " s_win=%" PRId64 " t_win=%" PRId64 " send_trailing_metadata=%p",
-            s->id, sent_initial_metadata, s->send_initial_metadata,
-            s->announce_window, s->flow_controlled_buffer.length,
-            s->outgoing_window, t->outgoing_window, s->send_trailing_metadata);
-
     /* send initial metadata if it's available */
     if (!sent_initial_metadata && s->send_initial_metadata) {
       grpc_chttp2_encode_header(&t->hpack_compressor, s->id,
@@ -185,7 +170,7 @@ bool grpc_chttp2_begin_write(grpc_exec_ctx *exec_ctx,
           s->fetching_send_message == NULL &&
           s->flow_controlled_buffer.length == 0) {
         grpc_chttp2_encode_header(&t->hpack_compressor, s->id,
-                                  s->send_trailing_metadata, 0,
+                                  s->send_trailing_metadata, true,
                                   &s->stats.outgoing, &t->outbuf);
         s->send_trailing_metadata = NULL;
         s->sent_trailing_metadata = true;