BugFix: Send WindowUpdate when ClearAbandonedStreams is called (#1786)

apache · Jun 9, 2022 · 4b80e95 · 4b80e95
1 parent 9556320
commit 4b80e95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/brpc/policy/http2_rpc_protocol.cpp b/src/brpc/policy/http2_rpc_protocol.cpp
@@ -372,25 +372,18 @@ int H2Context::Init() {
     return 0;
 }
 
-H2StreamContext* H2Context::RemoveStream(int stream_id) {
+H2StreamContext* H2Context::RemoveStreamAndDeferWU(int stream_id) {
     H2StreamContext* sctx = NULL;
     {
         std::unique_lock<butil::Mutex> mu(_stream_mutex);
         if (!_pending_streams.erase(stream_id, &sctx)) {
             return NULL;
         }
     }
-    return sctx;
-}
-
-H2StreamContext* H2Context::RemoveStreamAndDeferWU(int stream_id) {
-    H2StreamContext* sctx = RemoveStream(stream_id);
     // The remote stream will not send any more data, sending back the
     // stream-level WINDOW_UPDATE is pointless, just move the value into
     // the connection.
-    if (sctx) {
-        DeferWindowUpdate(sctx->ReleaseDeferredWindowUpdate());
-    }
+    DeferWindowUpdate(sctx->ReleaseDeferredWindowUpdate());
     return sctx;
 }
 
@@ -1152,7 +1145,7 @@ inline void H2Context::ClearAbandonedStreams() {
         const uint32_t stream_id = _abandoned_streams.back();
         _abandoned_streams.pop_back();
         mu.unlock();
-        H2StreamContext* sctx = RemoveStream(stream_id);
+        H2StreamContext* sctx = RemoveStreamAndDeferWU(stream_id);
         if (sctx != NULL) {
             delete sctx;
         }

diff --git a/src/brpc/policy/http2_rpc_protocol.h b/src/brpc/policy/http2_rpc_protocol.h
@@ -371,7 +371,6 @@ friend void InitFrameHandlers();
     H2ParseResult OnContinuation(butil::IOBufBytesIterator&, const H2FrameHead&);
 
     H2StreamContext* RemoveStreamAndDeferWU(int stream_id);
-    H2StreamContext* RemoveStream(int stream_id);
     void RemoveGoAwayStreams(int goaway_stream_id, std::vector<H2StreamContext*>* out_streams);
 
     H2StreamContext* FindStream(int stream_id);