From ae28d17897259c7acc87c4c1ca79293d3d06e983 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Fri, 10 Mar 2023 17:15:41 +0800 Subject: [PATCH 1/5] Prepare 3.1.8 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 a20edf2fed..e8b55603cf 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.8-SNAPSHOT + 3.1.8 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index b31835d2d0..c83716cd7d 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.8-SNAPSHOT + 3.1.8 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 964b000b5c..b617d591f6 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -32,7 +32,7 @@ pom - 3.1.8-SNAPSHOT + 3.1.8 1.1.0 4.2.0 3.4.14 diff --git a/pom.xml b/pom.xml index aafb747c2d..3b6dae0cc0 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ true true true - 3.1.8-SNAPSHOT + 3.1.8 From a6ef8910ca7cc2332f23fd4f285d23afe9791849 Mon Sep 17 00:00:00 2001 From: Xiang Wei Zhang Date: Mon, 13 Mar 2023 20:15:54 +0800 Subject: [PATCH 2/5] Fix 2.6.x LoadBalance SPI not work (#11730) --- .../src/main/java/com/alibaba/dubbo/rpc/Invoker.java | 5 +++++ .../src/main/java/com/alibaba/dubbo/rpc/Result.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java index 5ad026f620..124b063de6 100644 --- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java +++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java @@ -50,6 +50,11 @@ public interface Invoker extends org.apache.dubbo.rpc.Invoker { return invoker.getInterface(); } + @Override + public org.apache.dubbo.rpc.Result invoke(org.apache.dubbo.rpc.Invocation invocation) throws org.apache.dubbo.rpc.RpcException { + return new Result.CompatibleResult(invoker.invoke(invocation)); + } + @Override public Result invoke(Invocation invocation) throws RpcException { return new Result.CompatibleResult(invoker.invoke(invocation.getOriginal())); diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java index ff690c1dfc..3a1da951c0 100644 --- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java +++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java @@ -103,6 +103,11 @@ public interface Result extends org.apache.dubbo.rpc.Result { return delegate; } + @Override + public org.apache.dubbo.rpc.Result whenCompleteWithContext(BiConsumer fn) { + return delegate.whenCompleteWithContext(fn); + } + @Override public Object getValue() { return delegate.getValue(); From b19f89bef76b234ea0f80710356b0e9aae6a301a Mon Sep 17 00:00:00 2001 From: Mengyang Tang Date: Thu, 16 Mar 2023 09:49:00 +0800 Subject: [PATCH 3/5] Fix issue #11790 (#11824) --- .../org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java index 99f235385b..1bff438b27 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java @@ -29,6 +29,7 @@ import org.apache.dubbo.rpc.FutureContext; import org.apache.dubbo.rpc.Invocation; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; import org.apache.dubbo.rpc.RpcException; import org.apache.dubbo.rpc.RpcInvocation; import org.apache.dubbo.rpc.protocol.AbstractInvoker; @@ -103,6 +104,9 @@ public class DubboInvoker extends AbstractInvoker { } invocation.setAttachment(TIMEOUT_KEY, String.valueOf(timeout)); + + RpcContext.getServiceContext().setRemoteAddress(currentClient.getRemoteAddress()); + if (isOneway) { boolean isSent = getUrl().getMethodParameter(methodName, Constants.SENT_KEY, false); currentClient.send(inv, isSent); From 4f6528fb86a843b2308167ffd1e5faac22e33a4b Mon Sep 17 00:00:00 2001 From: GuoHao Date: Thu, 16 Mar 2023 10:23:19 +0800 Subject: [PATCH 4/5] Call onClose() when deser error (#11838) --- .../dubbo/rpc/protocol/tri/call/TripleClientCall.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java index a7d5e39d80..4ee3512adf 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java +++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java @@ -74,8 +74,10 @@ public class TripleClientCall implements ClientCall, ClientStream.Listener { final Object unpacked = requestMetadata.packableMethod.parseResponse(message); listener.onMessage(unpacked); } catch (Throwable t) { - cancelByLocal(TriRpcStatus.INTERNAL.withDescription("Deserialize response failed") - .withCause(t).asException()); + TriRpcStatus status = TriRpcStatus.INTERNAL.withDescription("Deserialize response failed") + .withCause(t); + cancelByLocal(status.asException()); + listener.onClose(status,null); LOGGER.error(PROTOCOL_FAILED_RESPONSE, "", "", String.format("Failed to deserialize triple response, service=%s, method=%s,connection=%s", connection, requestMetadata.service, requestMetadata.method.getMethodName()), t); } From 7d9e955cf888154c2d914688ca909545216b7b25 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Fri, 17 Mar 2023 10:03:06 +0800 Subject: [PATCH 5/5] Bump to 3.1.9-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 e8b55603cf..2ecc954a37 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.8 + 3.1.9-SNAPSHOT diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index c83716cd7d..6f06001ad4 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.8 + 3.1.9-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 b617d591f6..05c0dc9611 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -32,7 +32,7 @@ pom - 3.1.8 + 3.1.9-SNAPSHOT 1.1.0 4.2.0 3.4.14 diff --git a/pom.xml b/pom.xml index 3b6dae0cc0..23da357bed 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ true true true - 3.1.8 + 3.1.9-SNAPSHOT