This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit c35e82d08412d124f137b1a9f376af326a7f8651 Merge: fa485deb47 e95c4b50ab Author: Albumen Kevin <[email protected]> AuthorDate: Sat Oct 22 15:54:13 2022 +0800 Merge branch 'apache-3.1' into apache-3.2 # Conflicts: # .github/workflows/build-and-test-3.1.yml # .github/workflows/build-and-test-3.2.yml # .github/workflows/build-and-test-scheduled-3.2.yml # dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/TripleClientStream.java .github/workflows/build-and-test-scheduled-3.1.yml | 345 +++++++++++++++++++++ .../dubbo/common/logger/slf4j/Slf4jLoggerTest.java | 9 +- .../collector/DefaultMetricsCollectorTest.java | 6 +- .../annotation/ServiceAnnotationPostProcessor.java | 10 +- dubbo-dependencies-bom/pom.xml | 4 +- .../report/MetadataReportInstanceTest.java | 3 +- .../main/java/org/apache/dubbo/rpc/Constants.java | 2 + .../org/apache/dubbo/rpc/RpcServiceContext.java | 3 + .../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 9 +- .../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 10 +- .../dubbo/rpc/protocol/tri/RequestMetadata.java | 4 +- .../dubbo/rpc/protocol/tri/TripleHeaderEnum.java | 6 +- .../dubbo/rpc/protocol/tri/TripleInvoker.java | 8 + .../dubbo/rpc/protocol/tri/TripleProtocol.java | 12 + .../dubbo/rpc/protocol/tri/stream/StreamUtils.java | 31 +- .../protocol/tri/stream/TripleClientStream.java | 51 ++- .../protocol/tri/stream/TripleServerStream.java | 3 +- dubbo-spring-boot/pom.xml | 15 +- pom.xml | 2 +- 19 files changed, 499 insertions(+), 34 deletions(-) diff --cc dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/TripleClientStream.java index b694c28bc3,41815f6fab..496b12ebd0 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/TripleClientStream.java +++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/TripleClientStream.java @@@ -43,10 -35,18 +35,22 @@@ import org.apache.dubbo.rpc.protocol.tr import org.apache.dubbo.rpc.protocol.tri.transport.H2TransportListener; import org.apache.dubbo.rpc.protocol.tri.transport.TripleCommandOutBoundHandler; import org.apache.dubbo.rpc.protocol.tri.transport.TripleHttp2ClientResponseHandler; +import org.apache.dubbo.rpc.protocol.tri.transport.TripleWriteQueue; import org.apache.dubbo.rpc.protocol.tri.transport.WriteQueue; + import io.netty.buffer.ByteBuf; + import io.netty.channel.Channel; + import io.netty.channel.ChannelFuture; ++import io.netty.channel.ChannelHandlerContext; ++import io.netty.channel.ChannelInboundHandlerAdapter; + import io.netty.handler.codec.http2.Http2Error; + import io.netty.handler.codec.http2.Http2Headers; + import io.netty.handler.codec.http2.Http2StreamChannel; + import io.netty.handler.codec.http2.Http2StreamChannelBootstrap; + import io.netty.util.ReferenceCountUtil; + import io.netty.util.concurrent.Future; + +import java.io.IOException; import java.net.SocketAddress; import java.nio.charset.StandardCharsets; import java.util.Map; @@@ -60,12 -60,12 +64,14 @@@ import java.util.concurrent.Executor */ public class TripleClientStream extends AbstractStream implements ClientStream { + private static final Logger LOGGER = LoggerFactory.getLogger(TripleClientStream.class); + public final ClientStream.Listener listener; - private final WriteQueue writeQueue; + private final TripleWriteQueue writeQueue; private Deframer deframer; private final Channel parent; + private final Http2StreamChannel http2StreamChannel; + private boolean rst; // for test TripleClientStream(FrameworkModel frameworkModel,
