Revert "Revert "[chttp2] fix stream leak with queued flow control upd…

…ate and absence of writes (grpc#30907)" (grpc#30991)" This reverts commit 0f2a0f5.
apolcyn · Sep 14, 2022 · 75f4b0e · 75f4b0e
1 parent 16107cf
commit 75f4b0e
Show file tree

Hide file tree

Showing 6 changed files with 391 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -2314,7 +2314,7 @@ void grpc_chttp2_act_on_flowctl_action(
     grpc_chttp2_transport* t, grpc_chttp2_stream* s) {
   WithUrgency(t, action.send_stream_update(),
               GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL, [t, s]() {
-                if (s->id != 0) {
+                if (s->id != 0 && !s->read_closed) {
                   grpc_chttp2_mark_stream_writable(t, s);
                 }
               });

diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD
@@ -313,3 +313,17 @@ grpc_cc_test(
         "//test/core/util:grpc_test_util",
     ],
 )
+
+grpc_cc_test(
+    name = "stream_leak_with_queued_flow_control_update_test",
+    srcs = ["stream_leak_with_queued_flow_control_update_test.cc"],
+    external_deps = [
+        "gtest",
+    ],
+    language = "C++",
+    deps = [
+        "//:gpr",
+        "//:grpc",
+        "//test/core/util:grpc_test_util",
+    ],
+)