Reviewer comments

src/core/ext/filters/http/client/http_client_filter.cc

@@ -175,9 +175,6 @@ static void recv_trailing_metadata_ready(void* user_data, grpc_error* error) {
   if (calld->original_recv_initial_metadata_ready != nullptr) {
     calld->recv_trailing_metadata_error = GRPC_ERROR_REF(error);
     calld->seen_recv_trailing_metadata_ready = true;
-    GRPC_CLOSURE_INIT(&calld->recv_trailing_metadata_ready,
-                      recv_trailing_metadata_ready, elem,
-                      grpc_schedule_on_exec_ctx);
     GRPC_CALL_COMBINER_STOP(calld->call_combiner,
                             "deferring recv_trailing_metadata_ready until "
                             "after recv_initial_metadata_ready");

src/core/ext/filters/http/server/http_server_filter.cc

@@ -344,9 +344,6 @@ static void hs_recv_trailing_metadata_ready(void* user_data, grpc_error* err) {
   if (!calld->seen_recv_initial_metadata_ready) {
     calld->recv_trailing_metadata_ready_error = GRPC_ERROR_REF(err);
     calld->seen_recv_trailing_metadata_ready = true;
-    GRPC_CLOSURE_INIT(&calld->recv_trailing_metadata_ready,
-                      hs_recv_trailing_metadata_ready, elem,
-                      grpc_schedule_on_exec_ctx);
     GRPC_CALL_COMBINER_STOP(calld->call_combiner,
                             "deferring hs_recv_trailing_metadata_ready until "
                             "ater hs_recv_initial_metadata_ready");

src/core/ext/filters/message_size/message_size_filter.cc

@@ -168,9 +168,6 @@ static void recv_trailing_metadata_ready(void* user_data, grpc_error* error) {
   if (calld->next_recv_message_ready != nullptr) {
     calld->seen_recv_trailing_metadata = true;
     calld->recv_trailing_metadata_error = GRPC_ERROR_REF(error);
-    GRPC_CLOSURE_INIT(&calld->recv_trailing_metadata_ready,
-                      recv_trailing_metadata_ready, elem,
-                      grpc_schedule_on_exec_ctx);
     GRPC_CALL_COMBINER_STOP(calld->call_combiner,
                             "deferring recv_trailing_metadata_ready until "
                             "after recv_message_ready");

src/core/lib/security/transport/server_auth_filter.cc

@@ -45,7 +45,7 @@ struct call_data {
   grpc_closure recv_trailing_metadata_ready;
   grpc_closure* original_recv_trailing_metadata_ready;
   grpc_error* recv_trailing_metadata_error;
-  bool seen_recv_trailing_ready;
+  bool seen_recv_trailing_metadata_ready;
   grpc_metadata_array md;
   const grpc_metadata* consumed_md;
   size_t num_consumed_md;
@@ -119,7 +119,7 @@ static void on_md_processing_done_inner(grpc_call_element* elem,
   calld->recv_initial_metadata_error = GRPC_ERROR_REF(error);
   grpc_closure* closure = calld->original_recv_initial_metadata_ready;
   calld->original_recv_initial_metadata_ready = nullptr;
-  if (calld->seen_recv_trailing_ready) {
+  if (calld->seen_recv_trailing_metadata_ready) {
     GRPC_CALL_COMBINER_START(calld->call_combiner,
                              &calld->recv_trailing_metadata_ready,
                              calld->recv_trailing_metadata_error,
@@ -196,7 +196,7 @@ static void recv_initial_metadata_ready(void* arg, grpc_error* error) {
   }
   grpc_closure* closure = calld->original_recv_initial_metadata_ready;
   calld->original_recv_initial_metadata_ready = nullptr;
-  if (calld->seen_recv_trailing_ready) {
+  if (calld->seen_recv_trailing_metadata_ready) {
     GRPC_CALL_COMBINER_START(calld->call_combiner,
                              &calld->recv_trailing_metadata_ready,
                              calld->recv_trailing_metadata_error,
@@ -210,13 +210,11 @@ static void recv_trailing_metadata_ready(void* user_data, grpc_error* err) {
   call_data* calld = static_cast<call_data*>(elem->call_data);
   if (calld->original_recv_initial_metadata_ready != nullptr) {
     calld->recv_trailing_metadata_error = GRPC_ERROR_REF(err);
-    calld->seen_recv_trailing_ready = true;
-    GRPC_CLOSURE_INIT(&calld->recv_trailing_metadata_ready,
-                      recv_trailing_metadata_ready, elem,
-                      grpc_schedule_on_exec_ctx);
+    calld->seen_recv_trailing_metadata_ready = true;
     GRPC_CALL_COMBINER_STOP(calld->call_combiner,
                             "deferring recv_trailing_metadata_ready until "
                             "after recv_initial_metadata_ready");
+    return;
   }
   err = grpc_error_add_child(
       GRPC_ERROR_REF(err), GRPC_ERROR_REF(calld->recv_initial_metadata_error));

src/core/lib/surface/server.cc

@@ -730,11 +730,10 @@ static void server_on_recv_initial_metadata(void* ptr, grpc_error* error) {
   if (calld->host_set && calld->path_set) {
     /* do nothing */
   } else {
-    grpc_error* src_error = error;
-    error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(
-        "Missing :authority or :path", &error, 1);
-    /* Pass the src_error reference to calld->recv_initial_metadata_error */
-    calld->recv_initial_metadata_error = src_error;
+    /* Pass the error reference to calld->recv_initial_metadata_error */
+    calld->recv_initial_metadata_error =
+        GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(
+            "Missing :authority or :path", &error, 1);
   }
   grpc_closure* closure = calld->on_done_recv_initial_metadata;
   calld->on_done_recv_initial_metadata = nullptr;