From 318614005dfc65c17d7ecc376687af59a7d94dd4 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Sat, 25 Mar 2023 16:23:02 +0800 Subject: [PATCH 1/5] Prepare 3.0.15 release --- dubbo-dependencies-bom/pom.xml | 2 +- .../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 2ecc954a37..4476a484da 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -182,7 +182,7 @@ 2.0 1.1.0 1.21 - 3.1.9-SNAPSHOT + 3.1.9 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 6f06001ad4..921379d133 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -32,7 +32,7 @@ pom - 3.1.9-SNAPSHOT + 3.1.9 1.1.0 5.1.0 3.7.0 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index 05c0dc9611..72ebf91dc2 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -32,7 +32,7 @@ pom - 3.1.9-SNAPSHOT + 3.1.9 1.1.0 4.2.0 3.4.14 diff --git a/pom.xml b/pom.xml index 23da357bed..1fe61e3582 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ true true true - 3.1.9-SNAPSHOT + 3.1.9 From 5308cc81bfb2eb22948b6287e279b4d807c5846e Mon Sep 17 00:00:00 2001 From: earthchen Date: Wed, 12 Apr 2023 19:46:15 +0800 Subject: [PATCH 2/5] Fix tri headerfilter 3.1 (#12070) * change headerfilter scope * fix tri header filter --- .../org/apache/dubbo/rpc/HeaderFilter.java | 3 +- .../rpc/protocol/tri/TripleHttp2Protocol.java | 37 +++++++------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/HeaderFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/HeaderFilter.java index e82b697f3e..983c8c5d8b 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/HeaderFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/HeaderFilter.java @@ -16,9 +16,10 @@ */ package org.apache.dubbo.rpc; +import org.apache.dubbo.common.extension.ExtensionScope; import org.apache.dubbo.common.extension.SPI; -@SPI +@SPI(scope = ExtensionScope.FRAMEWORK) public interface HeaderFilter { RpcInvocation invoke(Invoker invoker, RpcInvocation invocation) throws RpcException; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java index 6fba53857c..692621ce04 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java +++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java @@ -17,6 +17,16 @@ package org.apache.dubbo.rpc.protocol.tri; +import io.netty.channel.Channel; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelPipeline; +import io.netty.handler.codec.http2.Http2FrameCodec; +import io.netty.handler.codec.http2.Http2FrameCodecBuilder; +import io.netty.handler.codec.http2.Http2FrameLogger; +import io.netty.handler.codec.http2.Http2MultiplexHandler; +import io.netty.handler.codec.http2.Http2Settings; +import io.netty.handler.logging.LogLevel; +import io.netty.handler.ssl.SslContext; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.config.Configuration; import org.apache.dubbo.common.config.ConfigurationUtils; @@ -28,7 +38,6 @@ import org.apache.dubbo.remoting.api.AbstractWireProtocol; import org.apache.dubbo.remoting.api.pu.ChannelHandlerPretender; import org.apache.dubbo.remoting.api.pu.ChannelOperator; import org.apache.dubbo.rpc.HeaderFilter; -import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.dubbo.rpc.model.FrameworkModel; import org.apache.dubbo.rpc.model.ScopeModelAware; import org.apache.dubbo.rpc.protocol.tri.transport.TripleClientHandler; @@ -37,17 +46,6 @@ import org.apache.dubbo.rpc.protocol.tri.transport.TripleHttp2FrameServerHandler import org.apache.dubbo.rpc.protocol.tri.transport.TripleServerConnectionHandler; import org.apache.dubbo.rpc.protocol.tri.transport.TripleTailHandler; -import io.netty.channel.Channel; -import io.netty.channel.ChannelInitializer; -import io.netty.channel.ChannelPipeline; -import io.netty.handler.codec.http2.Http2FrameCodec; -import io.netty.handler.codec.http2.Http2FrameCodecBuilder; -import io.netty.handler.codec.http2.Http2FrameLogger; -import io.netty.handler.codec.http2.Http2MultiplexHandler; -import io.netty.handler.codec.http2.Http2Settings; -import io.netty.handler.logging.LogLevel; -import io.netty.handler.ssl.SslContext; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -79,8 +77,6 @@ public class TripleHttp2Protocol extends AbstractWireProtocol implements ScopeMo private ExtensionLoader filtersLoader; private FrameworkModel frameworkModel; - private Configuration config = ConfigurationUtils.getGlobalConfiguration( - ApplicationModel.defaultModel()); public TripleHttp2Protocol() { super(new Http2ProtocolDetector()); @@ -89,12 +85,7 @@ public class TripleHttp2Protocol extends AbstractWireProtocol implements ScopeMo @Override public void setFrameworkModel(FrameworkModel frameworkModel) { this.frameworkModel = frameworkModel; - } - - @Override - public void setApplicationModel(ApplicationModel applicationModel) { - this.config = ConfigurationUtils.getGlobalConfiguration(applicationModel); - this.filtersLoader = applicationModel.getExtensionLoader(HeaderFilter.class); + this.filtersLoader = frameworkModel.getExtensionLoader(HeaderFilter.class); } @Override @@ -104,11 +95,10 @@ public class TripleHttp2Protocol extends AbstractWireProtocol implements ScopeMo @Override public void configServerProtocolHandler(URL url, ChannelOperator operator) { - + Configuration config = ConfigurationUtils.getGlobalConfiguration(url.getOrDefaultApplicationModel()); final List headFilters; if (filtersLoader != null) { - headFilters = filtersLoader.getActivateExtension(url, - HEADER_FILTER_KEY); + headFilters = filtersLoader.getActivateExtension(url, HEADER_FILTER_KEY); } else { headFilters = Collections.emptyList(); } @@ -154,6 +144,7 @@ public class TripleHttp2Protocol extends AbstractWireProtocol implements ScopeMo @Override public void configClientPipeline(URL url, ChannelPipeline pipeline, SslContext sslContext) { + Configuration config = ConfigurationUtils.getGlobalConfiguration(url.getOrDefaultApplicationModel()); final Http2FrameCodec codec = Http2FrameCodecBuilder.forClient() .gracefulShutdownTimeoutMillis(10000) .initialSettings(new Http2Settings().headerTableSize( From d73aca88477be782bad09a1cffdbd8c3ff9fbaa9 Mon Sep 17 00:00:00 2001 From: GuoHao Date: Thu, 13 Apr 2023 09:38:52 +0800 Subject: [PATCH 3/5] Upgrade jprotoc and grpc version (#12086) --- dubbo-dependencies-bom/pom.xml | 4 ++-- dubbo-xds/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index ed88d6d823..ab5602695d 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -142,9 +142,9 @@ 8.5.78 0.5.3 2.1.2 - 1.47.0 + 1.54.0 0.8.1 - 1.2.1 + 1.2.2 1.7.25 1.2 diff --git a/dubbo-xds/pom.xml b/dubbo-xds/pom.xml index 913fe84187..7e9ca6f75a 100644 --- a/dubbo-xds/pom.xml +++ b/dubbo-xds/pom.xml @@ -32,7 +32,7 @@ false 3.18.3 - 1.41.0 + 1.54.0 From 129b4fa2fd5aea13a0365d696c83f723d69413c7 Mon Sep 17 00:00:00 2001 From: earthchen Date: Fri, 14 Apr 2023 17:20:30 +0800 Subject: [PATCH 4/5] fix tri stub exception (#12093) * fix tri stub exception * fix --- .../org/apache/dubbo/rpc/stub/UnaryStubMethodHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/stub/UnaryStubMethodHandler.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/stub/UnaryStubMethodHandler.java index f2bff904f1..81e069fa63 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/stub/UnaryStubMethodHandler.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/stub/UnaryStubMethodHandler.java @@ -34,7 +34,11 @@ public class UnaryStubMethodHandler implements StubMethodHandler { T request = (T) arguments[0]; CompletableFuture future = new CompletableFuture<>(); StreamObserver responseObserver = new FutureToObserverAdaptor<>(future); - func.accept(request, responseObserver); + try { + func.accept(request, responseObserver); + } catch (Throwable e) { + future.completeExceptionally(e); + } return future; } } From d6e32f201bf2a5d163fc5848772cea4bd58c2147 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Sat, 15 Apr 2023 07:25:48 +0800 Subject: [PATCH 5/5] Bump to 3.1.10-SNAPSHOT --- dubbo-dependencies-bom/pom.xml | 2 +- .../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 44e92ba570..154e9c001e 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -182,7 +182,7 @@ 2.0 1.1.0 1.21 - 3.1.9 + 3.1.10-SNAPSHOT diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 921379d133..15825e5eda 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -32,7 +32,7 @@ pom - 3.1.9 + 3.1.10-SNAPSHOT 1.1.0 5.1.0 3.7.0 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index 72ebf91dc2..c242d83b51 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -32,7 +32,7 @@ pom - 3.1.9 + 3.1.10-SNAPSHOT 1.1.0 4.2.0 3.4.14 diff --git a/pom.xml b/pom.xml index 1fe61e3582..697ee9360b 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ true true true - 3.1.9 + 3.1.10-SNAPSHOT