You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/11/29 12:44:28 UTC
[dubbo] branch 3.2 updated (b23cfa8c07 -> 8c61f9b225)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from b23cfa8c07 dubbo metrics to springboot endpoints (#10997)
add 4781862ee2 Prepare 3.1.3 release
add 8b2cd33765 Merge branch 'apache-3.1' into 3.1.3-release
add a7bbb8ae51 Merge branch 'apache-3.1' into 3.1.3-release
add e3e086829e Merge branch 'apache-3.1' into 3.1.3-release
add b11c1e63ea Disable FileTest on Win
add 01374904ab Merge branch '3.1.3-release' into apache-3.1
add b38dc9c1cd Dump to 3.1.4-SNAPSHOT
add 7aaba188e1 Revert "Disable FileTest on Win"
add 4568958ef5 Adjust the logic of timeout, fix triple about timeout countdown function problem (#11030)
add 160fbba6bb Fix data being updated by default ticket (#11050)
add f618368b54 Add NPE and empty list check in AwareClusterInvoker#doInvoke. (#11046)
add f670fa33ad Enhance unit test cases (#11037)
add d07d89159f Error code is managed with constants (#10771) (#11054)
new 8c61f9b225 Merge branch 'apache-3.1' into apache-3.2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../support/registry/ZoneAwareClusterInvoker.java | 4 +-
.../registry/ZoneAwareClusterInvokerTest.java | 13 ++
.../common/constants/LoggerCodeConstants.java | 4 +-
.../common/threadlocal/InternalThreadLocalMap.java | 6 +-
.../threadpool/support/AbortPolicyWithReport.java | 14 +-
.../concurrent/CompletableFutureTaskTest.java | 20 +--
.../file/FileSystemDynamicConfigurationTest.java | 2 +-
.../threadlocal/InternalThreadLocalTest.java | 19 ++-
.../threadpool/manager/ExecutorRepositoryTest.java | 77 ++++------
.../manager/FrameworkExecutorRepositoryTest.java | 78 +++++-----
.../threadpool/serial/SerializingExecutorTest.java | 93 +++++++++---
.../support/AbortPolicyWithReportTest.java | 67 ++++-----
.../support/eager/EagerThreadPoolExecutorTest.java | 161 +++++++++++++++++++--
.../dubbo/common/timer/HashedWheelTimerTest.java | 23 +--
.../dubbo/common/utils/ExecutorUtilTest.java | 13 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 4 +-
.../annotation/MethodConfigCallbackTest.java | 36 ++---
.../store/zookeeper/ZookeeperMetadataReport.java | 2 +-
.../zookeeper/AbstractZookeeperClient.java | 6 +-
.../dubbo/remoting/zookeeper/ZookeeperClient.java | 2 +-
.../curator5/Curator5ZookeeperClient.java | 8 +-
.../curator5/Curator5ZookeeperClientTest.java | 34 ++++-
.../zookeeper/curator/CuratorZookeeperClient.java | 8 +-
.../curator/CuratorZookeeperClientTest.java | 34 ++++-
.../org/apache/dubbo/rpc/support/RpcUtils.java | 21 +--
.../dubbo/rpc/protocol/dubbo/DubboCodec.java | 2 +-
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 2 +-
.../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 2 +-
.../dubbo/rpc/protocol/tri/TripleInvoker.java | 7 +-
29 files changed, 493 insertions(+), 269 deletions(-)
[dubbo] 01/01: Merge branch 'apache-3.1' into apache-3.2
Posted by al...@apache.org.
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 8c61f9b225f889761a78d7b0f6c884b051e09e35
Merge: b23cfa8c07 d07d89159f
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Tue Nov 29 20:42:33 2022 +0800
Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
# dubbo-dependencies-bom/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
# pom.xml
.../support/registry/ZoneAwareClusterInvoker.java | 4 +-
.../registry/ZoneAwareClusterInvokerTest.java | 13 ++
.../common/constants/LoggerCodeConstants.java | 4 +-
.../common/threadlocal/InternalThreadLocalMap.java | 6 +-
.../threadpool/support/AbortPolicyWithReport.java | 14 +-
.../concurrent/CompletableFutureTaskTest.java | 20 +--
.../file/FileSystemDynamicConfigurationTest.java | 2 +-
.../threadlocal/InternalThreadLocalTest.java | 19 ++-
.../threadpool/manager/ExecutorRepositoryTest.java | 77 ++++------
.../manager/FrameworkExecutorRepositoryTest.java | 78 +++++-----
.../threadpool/serial/SerializingExecutorTest.java | 93 +++++++++---
.../support/AbortPolicyWithReportTest.java | 67 ++++-----
.../support/eager/EagerThreadPoolExecutorTest.java | 161 +++++++++++++++++++--
.../dubbo/common/timer/HashedWheelTimerTest.java | 23 +--
.../dubbo/common/utils/ExecutorUtilTest.java | 13 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 4 +-
.../annotation/MethodConfigCallbackTest.java | 36 ++---
.../store/zookeeper/ZookeeperMetadataReport.java | 2 +-
.../zookeeper/AbstractZookeeperClient.java | 6 +-
.../dubbo/remoting/zookeeper/ZookeeperClient.java | 2 +-
.../curator5/Curator5ZookeeperClient.java | 8 +-
.../curator5/Curator5ZookeeperClientTest.java | 34 ++++-
.../zookeeper/curator/CuratorZookeeperClient.java | 8 +-
.../curator/CuratorZookeeperClientTest.java | 34 ++++-
.../org/apache/dubbo/rpc/support/RpcUtils.java | 21 +--
.../dubbo/rpc/protocol/dubbo/DubboCodec.java | 2 +-
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 2 +-
.../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 2 +-
.../dubbo/rpc/protocol/tri/TripleInvoker.java | 7 +-
29 files changed, 493 insertions(+), 269 deletions(-)
diff --cc dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
index 241caf30a9,ca0a9f77f0..f888346dba
--- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
@@@ -103,10 -103,10 +103,10 @@@ public class TripleInvoker<T> extends A
@Override
protected Result doInvoke(final Invocation invocation) {
- if (!connection.isAvailable()) {
+ if (!connectionClient.isConnected()) {
CompletableFuture<AppResponse> future = new CompletableFuture<>();
RpcException exception = TriRpcStatus.UNAVAILABLE.withDescription(
- String.format("upstream %s is unavailable", getUrl().getAddress()))
+ String.format("upstream %s is unavailable", getUrl().getAddress()))
.asException();
future.completeExceptionally(exception);
return new AsyncRpcResult(future, invocation);