Close server channel (#14199)

apache · May 17, 2024 · e8ccb01 · e8ccb01
1 parent e826b0c
commit e8ccb01
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/...-http12/src/main/java/org/apache/dubbo/remoting/http12/h2/Http2ServerChannelObserver.java b/...-http12/src/main/java/org/apache/dubbo/remoting/http12/h2/Http2ServerChannelObserver.java
@@ -119,4 +119,9 @@ public void disableAutoFlowControl() {
     public boolean isAutoRequestN() {
         return autoRequestN;
     }
+
+    public void onStreamClosed() {
+        closed = true;
+        streamingDecoder.onStreamClosed();
+    }
 }
diff --git a/...2/src/main/java/org/apache/dubbo/remoting/http12/message/LengthFieldStreamingDecoder.java b/...2/src/main/java/org/apache/dubbo/remoting/http12/message/LengthFieldStreamingDecoder.java
@@ -84,6 +84,19 @@ public final void close() {
         deliver();
     }
 
+    @Override
+    public final void onStreamClosed() {
+        if (closed) {
+            return;
+        }
+        closed = true;
+        try {
+            accumulate.close();
+        } catch (IOException e) {
+            throw new DecodeException(e);
+        }
+    }
+
     @Override
     public final void setFragmentListener(FragmentListener listener) {
         this.listener = listener;

diff --git a/...g-http12/src/main/java/org/apache/dubbo/remoting/http12/message/NoOpStreamingDecoder.java b/...g-http12/src/main/java/org/apache/dubbo/remoting/http12/message/NoOpStreamingDecoder.java
@@ -39,6 +39,11 @@ public void close() {
         this.listener.onClose();
     }
 
+    @Override
+    public void onStreamClosed() {
+        // do nothing
+    }
+
     @Override
     public void setFragmentListener(FragmentListener listener) {
         this.listener = listener;

diff --git a/...oting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/StreamingDecoder.java b/...oting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/StreamingDecoder.java
@@ -28,6 +28,8 @@ public interface StreamingDecoder {
 
     void close();
 
+    void onStreamClosed();
+
     void setFragmentListener(FragmentListener listener);
 
     interface FragmentListener {

diff --git a/...java/org/apache/dubbo/rpc/protocol/tri/h12/http2/GenericHttp2ServerTransportListener.java b/...java/org/apache/dubbo/rpc/protocol/tri/h12/http2/GenericHttp2ServerTransportListener.java
@@ -191,7 +191,7 @@ protected final Http2ServerChannelObserver getServerChannelObserver() {
     @Override
     public void onStreamClosed() {
         // doing on event loop thread
-        getStreamingDecoder().close();
+        getServerChannelObserver().onStreamClosed();
     }
 
     private static class Http2StreamingDecodeListener implements ListeningDecoder.Listener {