Fix errors

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

@@ -1688,8 +1688,8 @@ static void cancel_pings(grpc_chttp2_transport* t, grpc_error* error) {
 static void send_ping_locked(grpc_chttp2_transport* t,
                              grpc_closure* on_initiate, grpc_closure* on_ack) {
   if (t->closed_with_error != GRPC_ERROR_NONE) {
-    GRPC_CLOSURE_SCHED(on_initiate, GRPC_ERROR_REF(t->closed_with_error));
-    GRPC_CLOSURE_SCHED(on_ack, GRPC_ERROR_REF(t->closed_with_error));
+    t->combiner->Run(on_initiate, GRPC_ERROR_REF(t->closed_with_error));
+    t->combiner->Run(on_ack, GRPC_ERROR_REF(t->closed_with_error));
     return;
   }
   grpc_chttp2_ping_queue* pq = &t->ping_queue;

src/core/lib/iomgr/combiner.cc

@@ -302,6 +302,7 @@ static void enqueue_finally(void* closure, grpc_error* error);
 
 static void combiner_finally_exec(grpc_core::Combiner* lock,
                                   grpc_closure* closure, grpc_error* error) {
+  GPR_ASSERT(lock != nullptr);
   GPR_TIMER_SCOPE("combiner.execute_finally", 0);
   GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS();
   GRPC_COMBINER_TRACE(gpr_log(
@@ -309,10 +310,10 @@ static void combiner_finally_exec(grpc_core::Combiner* lock,
       grpc_core::ExecCtx::Get()->combiner_data()->active_combiner));
   if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner != lock) {
     GPR_TIMER_MARK("slowpath", 0);
-    lock->Run(
-        GRPC_CLOSURE_CREATE(enqueue_finally, closure,
-                            reinterpret_cast<grpc_closure_scheduler*>(lock)),
-        error);
+    // Reusing scheduler to store the combiner so that it can be accessed in
+    // enqueue_finally
+    closure->scheduler = reinterpret_cast<grpc_closure_scheduler*>(lock);
+    lock->Run(GRPC_CLOSURE_CREATE(enqueue_finally, closure, nullptr), error);
     return;
   }
 

test/core/end2end/fixtures/http_proxy_fixture.cc

@@ -525,33 +525,40 @@ static void on_accept(void* arg, grpc_endpoint* endpoint,
   grpc_pollset_set_add_pollset(conn->pollset_set, proxy->pollset);
   grpc_endpoint_add_to_pollset_set(endpoint, conn->pollset_set);
   GRPC_CLOSURE_INIT(&conn->on_read_request_done, on_read_request_done, conn,
-                    grpc_schedule_on_exec_ctx);
+                    nullptr);
   GRPC_CLOSURE_INIT(&conn->on_server_connect_done, on_server_connect_done, conn,
-                    grpc_schedule_on_exec_ctx);
+                    nullptr);
   GRPC_CLOSURE_INIT(&conn->on_write_response_done, on_write_response_done, conn,
-                    grpc_schedule_on_exec_ctx);
+                    nullptr);
   GRPC_CLOSURE_INIT(&conn->on_client_read_done, on_client_read_done, conn,
-                    grpc_schedule_on_exec_ctx);
+                    nullptr);
   GRPC_CLOSURE_INIT(&conn->on_client_write_done, on_client_write_done, conn,
-                    grpc_schedule_on_exec_ctx);
+                    nullptr);
   GRPC_CLOSURE_INIT(&conn->on_server_read_done, on_server_read_done, conn,
-                    grpc_schedule_on_exec_ctx);
+                    nullptr);
   GRPC_CLOSURE_INIT(&conn->on_server_write_done, on_server_write_done, conn,
-                    grpc_schedule_on_exec_ctx);
+                    nullptr);
   GRPC_CLOSURE_INIT(&conn->on_read_request_done_hopper,
-                    on_read_request_done_hopper, conn, nullptr);
+                    on_read_request_done_hopper, conn,
+                    grpc_schedule_on_exec_ctx);
   GRPC_CLOSURE_INIT(&conn->on_server_connect_done_hopper,
-                    on_server_connect_done_hopper, conn, nullptr);
+                    on_server_connect_done_hopper, conn,
+                    grpc_schedule_on_exec_ctx);
   GRPC_CLOSURE_INIT(&conn->on_write_response_done_hopper,
-                    on_write_response_done_hopper, conn, nullptr);
+                    on_write_response_done_hopper, conn,
+                    grpc_schedule_on_exec_ctx);
   GRPC_CLOSURE_INIT(&conn->on_client_read_done_hopper,
-                    on_client_read_done_hopper, conn, nullptr);
+                    on_client_read_done_hopper, conn,
+                    grpc_schedule_on_exec_ctx);
   GRPC_CLOSURE_INIT(&conn->on_client_write_done_hopper,
-                    on_client_write_done_hopper, conn, nullptr);
+                    on_client_write_done_hopper, conn,
+                    grpc_schedule_on_exec_ctx);
   GRPC_CLOSURE_INIT(&conn->on_server_read_done_hopper,
-                    on_server_read_done_hopper, conn, nullptr);
+                    on_server_read_done_hopper, conn,
+                    grpc_schedule_on_exec_ctx);
   GRPC_CLOSURE_INIT(&conn->on_server_write_done_hopper,
-                    on_server_write_done_hopper, conn, nullptr);
+                    on_server_write_done_hopper, conn,
+                    grpc_schedule_on_exec_ctx);
   grpc_slice_buffer_init(&conn->client_read_buffer);
   grpc_slice_buffer_init(&conn->client_deferred_write_buffer);
   conn->client_is_writing = false;