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 2021/12/27 02:28:35 UTC
[dubbo] branch 3.0 updated (5e8f554 -> f06bbcc)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from 5e8f554 [3.0] Fallback use class's cl to adapt ut (#9483)
add dd539ce fix: Update the version of log4j for bug fixes (#9377)
add afa506f fix #9374(Directory already destroyed), stop process when check=false is not set (#9396)
add c076890 keep both old and new key (#9401)
add 9ef175a [3.0] fix #9346 use CopyOnWriteArrayList (#9348)
add b094665 support empty address protection (#9408)
add 4599ed4 Add instance url scopeModel (#9290)
add c7c5af3 fix when consumer shutdown occurs npe (#9409)
add 3dac257 upgrade log4j2 version to 2.16.0 (#9434)
add 74ae5bf upgrade log4j2 version to 2.17.0 (#9443)
add 3d7557b Adjust the way to obtain codec extension (#9442)
add c2b6303 Passing parameters down directly from Protocol to Remoting components. (#9453)
add 10aaa0f save url attributes on initialization (#9467)
add 8f5b905 bump version to 3.0.5
add 098787a fix async call issues, rpc context and response future callback race conditions (#9464)
add 2759f38 try moving finally block (#9496)
new e554427 Merge remote-tracking branch 'apache/3.0.5-release' into apache-3.0
new f06bbcc change version to 3.0.6-SNAPSHOT
The 2 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:
compiler/pom.xml | 2 +-
.../cluster/filter/DefaultFilterChainBuilder.java | 81 +++++++-
.../rpc/cluster/filter/FilterChainBuilder.java | 204 ++++++++++++++++++++-
.../filter/support/ConsumerContextFilter.java | 37 ++--
.../filter/DefaultFilterChainBuilderTest.java | 17 +-
.../support/FailoverClusterInvokerTest.java | 2 +-
.../support/MergeableClusterInvokerTest.java | 7 +-
.../support/wrapper/AbstractClusterTest.java | 6 +-
.../java/org/apache/dubbo/common/Experimental.java | 2 +-
.../common/config/CompositeConfiguration.java | 17 +-
.../dubbo/common/config/ConfigurationCache.java | 3 +-
.../dubbo/common/config/ConfigurationUtils.java | 11 +-
.../dubbo/common/config/InmemoryConfiguration.java | 6 +-
.../dubbo/common/constants/CommonConstants.java | 10 +
.../dubbo/common/constants/RegistryConstants.java | 6 +-
.../dubbo/common/extension/ExtensionDirector.java | 8 +-
.../extension/support/ActivateComparator.java | 6 +-
...r.java => MultiInstanceActivateComparator.java} | 41 +++--
.../org/apache/dubbo/config/ApplicationConfig.java | 32 ++--
.../org/apache/dubbo/config/RegistryConfig.java | 28 +--
.../org/apache/dubbo/rpc/model/ScopeModelUtil.java | 5 +-
.../apache/dubbo/rpc/model/FrameworkModelTest.java | 1 +
.../dubbo/config/deploy/DefaultModuleDeployer.java | 3 +-
.../apache/dubbo/config/ReferenceConfigTest.java | 9 -
.../AbstractRegistryCenterExporterListener.java | 36 +++-
dubbo-config/dubbo-config-spring/pom.xml | 5 +
.../src/main/resources/META-INF/compat/dubbo.xsd | 22 ++-
.../src/main/resources/META-INF/dubbo.xsd | 18 +-
.../dubbo-demo-spring-boot-consumer/pom.xml | 7 +
.../dubbo-demo-spring-boot-provider/pom.xml | 7 +
dubbo-dependencies-bom/pom.xml | 5 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../dubbo/auth/filter/ProviderAuthFilterTest.java | 16 +-
.../dubbo/registry/client/InstanceAddressURL.java | 6 -
.../client/ServiceDiscoveryRegistryDirectory.java | 7 +-
.../listener/ServiceInstancesChangedListener.java | 13 +-
.../registry/integration/RegistryDirectory.java | 1 +
.../support/CacheableFailbackRegistry.java | 10 +-
.../registry/CacheableFailbackRegistryTest.java | 60 ++++++
.../dubbo/registry/MockCacheableRegistryImpl.java | 12 ++
.../ServiceInstancesChangedListenerTest.java | 8 +-
.../dubbo/registry/multiple/MultipleRegistry.java | 2 +-
.../multiple/MultipleRegistry2S2RTest.java | 4 +-
.../apache/dubbo/registry/nacos/NacosRegistry.java | 11 +-
.../dubbo/remoting/transport/AbstractEndpoint.java | 11 +-
.../support/header/HeartbeatHandlerTest.java | 19 +-
.../transport/netty/ClientReconnectTest.java | 2 +-
.../remoting/transport/netty/NettyClientTest.java | 8 +-
.../transport/netty/NettyClientToServerTest.java | 4 +-
.../remoting/transport/netty/NettyStringTest.java | 4 +-
.../remoting/transport/netty/ThreadNameTest.java | 4 +-
.../java/org/apache/dubbo/rpc/AsyncContext.java | 46 +++++
.../org/apache/dubbo/rpc/AsyncContextImpl.java | 25 ++-
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 45 ++---
.../main/java/org/apache/dubbo/rpc/BaseFilter.java | 23 +++
.../org/apache/dubbo/rpc/ListenableFilter.java | 3 +-
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 64 ++++++-
.../org/apache/dubbo/rpc/RpcContextAttachment.java | 24 +++
.../org/apache/dubbo/rpc/RpcServiceContext.java | 28 ++-
.../rpc/filter/ClassLoaderCallbackFilter.java | 27 ++-
.../apache/dubbo/rpc/filter/ClassLoaderFilter.java | 40 +++-
.../org/apache/dubbo/rpc/filter/ContextFilter.java | 24 +--
.../dubbo/rpc/proxy/AbstractProxyInvoker.java | 14 +-
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 3 +-
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 5 +
.../rpc/filter/CompatibleFilterFilterTest.java | 19 +-
.../apache/dubbo/rpc/filter/ContextFilterTest.java | 6 +-
.../apache/dubbo/rpc/filter/EchoFilterTest.java | 3 +-
.../apache/dubbo/rpc/filter/TimeoutFilterTest.java | 3 +-
.../apache/dubbo/rpc/support/MockInvocation.java | 4 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 4 +-
.../protocol/dubbo/LazyConnectExchangeClient.java | 7 +-
.../dubbo/ReferenceCountExchangeClient.java | 21 ++-
.../rpc/protocol/dubbo/DubboProtocolTest.java | 31 ++--
.../dubbo/rpc/protocol/dubbo/RpcFilterTest.java | 1 +
.../dubbo-spring-boot-actuator/pom.xml | 20 ++
.../dubbo-spring-boot-autoconfigure/pom.xml | 14 ++
.../dubbo-spring-boot-compatible/actuator/pom.xml | 7 +
.../autoconfigure/pom.xml | 14 ++
.../dubbo-spring-boot-starter/pom.xml | 13 ++
dubbo-spring-boot/pom.xml | 2 +
pom.xml | 4 +-
82 files changed, 1089 insertions(+), 303 deletions(-)
copy dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/{ActivateComparator.java => MultiInstanceActivateComparator.java} (80%)
copy dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/LogFilter.java => dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ClassLoaderCallbackFilter.java (65%)
[dubbo] 01/02: Merge remote-tracking branch 'apache/3.0.5-release' into apache-3.0
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit e554427a1a50e40cb5e89ba5014eb8b90fe1fdab
Merge: 5e8f554 2759f38
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Dec 27 10:24:09 2021 +0800
Merge remote-tracking branch 'apache/3.0.5-release' into apache-3.0
# Conflicts:
# dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java
# dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/BitList.java
# dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
# dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ClassLoaderFilter.java
compiler/pom.xml | 2 +-
.../cluster/filter/DefaultFilterChainBuilder.java | 81 +++++++-
.../rpc/cluster/filter/FilterChainBuilder.java | 204 ++++++++++++++++++++-
.../filter/support/ConsumerContextFilter.java | 37 ++--
.../filter/DefaultFilterChainBuilderTest.java | 17 +-
.../support/FailoverClusterInvokerTest.java | 2 +-
.../support/MergeableClusterInvokerTest.java | 7 +-
.../support/wrapper/AbstractClusterTest.java | 6 +-
.../java/org/apache/dubbo/common/Experimental.java | 2 +-
.../common/config/CompositeConfiguration.java | 17 +-
.../dubbo/common/config/ConfigurationCache.java | 3 +-
.../dubbo/common/config/ConfigurationUtils.java | 11 +-
.../dubbo/common/config/InmemoryConfiguration.java | 6 +-
.../dubbo/common/constants/CommonConstants.java | 10 +
.../dubbo/common/constants/RegistryConstants.java | 6 +-
.../dubbo/common/extension/ExtensionDirector.java | 8 +-
.../extension/support/ActivateComparator.java | 6 +-
...r.java => MultiInstanceActivateComparator.java} | 41 +++--
.../org/apache/dubbo/config/ApplicationConfig.java | 32 ++--
.../org/apache/dubbo/config/RegistryConfig.java | 28 +--
.../org/apache/dubbo/rpc/model/ScopeModelUtil.java | 5 +-
.../apache/dubbo/rpc/model/FrameworkModelTest.java | 1 +
.../dubbo/config/deploy/DefaultModuleDeployer.java | 3 +-
.../apache/dubbo/config/ReferenceConfigTest.java | 9 -
.../AbstractRegistryCenterExporterListener.java | 36 +++-
dubbo-config/dubbo-config-spring/pom.xml | 5 +
.../src/main/resources/META-INF/compat/dubbo.xsd | 22 ++-
.../src/main/resources/META-INF/dubbo.xsd | 18 +-
.../dubbo-demo-spring-boot-consumer/pom.xml | 7 +
.../dubbo-demo-spring-boot-provider/pom.xml | 7 +
dubbo-dependencies-bom/pom.xml | 5 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../dubbo/auth/filter/ProviderAuthFilterTest.java | 16 +-
.../dubbo/registry/client/InstanceAddressURL.java | 6 -
.../client/ServiceDiscoveryRegistryDirectory.java | 7 +-
.../listener/ServiceInstancesChangedListener.java | 13 +-
.../registry/integration/RegistryDirectory.java | 1 +
.../support/CacheableFailbackRegistry.java | 10 +-
.../registry/CacheableFailbackRegistryTest.java | 60 ++++++
.../dubbo/registry/MockCacheableRegistryImpl.java | 12 ++
.../ServiceInstancesChangedListenerTest.java | 8 +-
.../dubbo/registry/multiple/MultipleRegistry.java | 2 +-
.../multiple/MultipleRegistry2S2RTest.java | 4 +-
.../apache/dubbo/registry/nacos/NacosRegistry.java | 11 +-
.../dubbo/remoting/transport/AbstractEndpoint.java | 11 +-
.../support/header/HeartbeatHandlerTest.java | 19 +-
.../transport/netty/ClientReconnectTest.java | 2 +-
.../remoting/transport/netty/NettyClientTest.java | 8 +-
.../transport/netty/NettyClientToServerTest.java | 4 +-
.../remoting/transport/netty/NettyStringTest.java | 4 +-
.../remoting/transport/netty/ThreadNameTest.java | 4 +-
.../java/org/apache/dubbo/rpc/AsyncContext.java | 46 +++++
.../org/apache/dubbo/rpc/AsyncContextImpl.java | 25 ++-
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 45 ++---
.../main/java/org/apache/dubbo/rpc/BaseFilter.java | 23 +++
.../org/apache/dubbo/rpc/ListenableFilter.java | 3 +-
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 64 ++++++-
.../org/apache/dubbo/rpc/RpcContextAttachment.java | 24 +++
.../org/apache/dubbo/rpc/RpcServiceContext.java | 28 ++-
...rFilter.java => ClassLoaderCallbackFilter.java} | 41 +++--
.../apache/dubbo/rpc/filter/ClassLoaderFilter.java | 40 +++-
.../org/apache/dubbo/rpc/filter/ContextFilter.java | 24 +--
.../dubbo/rpc/proxy/AbstractProxyInvoker.java | 14 +-
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 3 +-
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 5 +
.../rpc/filter/CompatibleFilterFilterTest.java | 19 +-
.../apache/dubbo/rpc/filter/ContextFilterTest.java | 6 +-
.../apache/dubbo/rpc/filter/EchoFilterTest.java | 3 +-
.../apache/dubbo/rpc/filter/TimeoutFilterTest.java | 3 +-
.../apache/dubbo/rpc/support/MockInvocation.java | 4 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 4 +-
.../protocol/dubbo/LazyConnectExchangeClient.java | 7 +-
.../dubbo/ReferenceCountExchangeClient.java | 21 ++-
.../rpc/protocol/dubbo/DubboProtocolTest.java | 31 ++--
.../dubbo/rpc/protocol/dubbo/RpcFilterTest.java | 1 +
.../dubbo-spring-boot-actuator/pom.xml | 20 ++
.../dubbo-spring-boot-autoconfigure/pom.xml | 14 ++
.../dubbo-spring-boot-compatible/actuator/pom.xml | 7 +
.../autoconfigure/pom.xml | 14 ++
.../dubbo-spring-boot-starter/pom.xml | 13 ++
dubbo-spring-boot/pom.xml | 2 +
pom.xml | 4 +-
82 files changed, 1093 insertions(+), 313 deletions(-)
diff --cc dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index 7cf182f,be5e20d..bb3833b
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@@ -506,8 -504,10 +506,18 @@@ public interface CommonConstants
String DUBBO_INTERNAL_APPLICATION = "DUBBO_INTERNAL_APPLICATION";
+ String RETRY_TIMES_KEY = "retry-times";
++
+ String RETRY_PERIOD_KEY = "retry-period";
++
+ String SYNC_REPORT_KEY = "sync-report";
++
+ String CYCLE_REPORT_KEY = "cycle-report";
++
+ String WORKING_CLASSLOADER_KEY = "WORKING_CLASSLOADER";
+
+ String STAGED_CLASSLOADER_KEY = "STAGED_CLASSLOADER";
+
+ String PROVIDER_ASYNC_KEY = "PROVIDER_ASYNC";
+
}
diff --cc dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
index 904ce83,0ac6b73..c279eee
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
@@@ -177,11 -174,8 +175,9 @@@ public class ReferenceConfigTest
applicationConfig.setRegisterConsumer(false);
applicationConfig.setRepository("repository1");
applicationConfig.setEnableFileCache(false);
- applicationConfig.setPublishInstance(false);
- applicationConfig.setPublishInterface(false);
applicationConfig.setProtocol("dubbo");
applicationConfig.setMetadataServicePort(88888);
+ applicationConfig.setMetadataServiceProtocol("tri");
applicationConfig.setLivenessProbe("livenessProbe");
applicationConfig.setReadinessProbe("readinessProb");
applicationConfig.setStartupProbe("startupProbe");
@@@ -315,15 -309,8 +311,10 @@@
serviceMetadata.getAttachments().get("repository"));
Assertions.assertEquals(applicationConfig.getEnableFileCache().toString(),
serviceMetadata.getAttachments().get(REGISTRY_LOCAL_FILE_CACHE_ENABLED));
- Assertions.assertEquals(applicationConfig.getPublishInstance().toString(),
- serviceMetadata.getAttachments().get(REGISTRY_PUBLISH_INSTANCE_KEY));
- Assertions.assertEquals(applicationConfig.getPublishInterface().toString(),
- serviceMetadata.getAttachments().get(REGISTRY_PUBLISH_INTERFACE_KEY));
- Assertions.assertTrue(serviceMetadata.getAttachments().containsKey(REGISTRY_PUBLISH_INTERFACE_KEY));
Assertions.assertEquals(applicationConfig.getMetadataServicePort().toString(),
serviceMetadata.getAttachments().get(METADATA_SERVICE_PORT_KEY));
+ Assertions.assertEquals(applicationConfig.getMetadataServiceProtocol().toString(),
+ serviceMetadata.getAttachments().get(METADATA_SERVICE_PROTOCOL_KEY));
Assertions.assertEquals(applicationConfig.getLivenessProbe(),
serviceMetadata.getAttachments().get(LIVENESS_PROBE_KEY));
Assertions.assertEquals(applicationConfig.getReadinessProbe(),
diff --cc dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ClassLoaderFilter.java
index 99bae40,6a14fe1..c4dd01c
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ClassLoaderFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ClassLoaderFilter.java
@@@ -32,16 -36,12 +36,20 @@@ public class ClassLoaderFilter implemen
@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
- ClassLoader ocl = Thread.currentThread().getContextClassLoader();
- ClassLoader newClassLoader;
+ ClassLoader stagedClassLoader = Thread.currentThread().getContextClassLoader();
- ClassLoader effectiveClassLoader = invoker.getInterface().getClassLoader();
- invocation.put(STAGED_CLASSLOADER_KEY, stagedClassLoader);
- invocation.put(WORKING_CLASSLOADER_KEY, effectiveClassLoader);
++ ClassLoader effectiveClassLoader;
+ if (invocation.getServiceModel() != null) {
- newClassLoader = invocation.getServiceModel().getClassLoader();
++ effectiveClassLoader = invocation.getServiceModel().getClassLoader();
+ } else {
- newClassLoader = invoker.getClass().getClassLoader();
++ effectiveClassLoader = invoker.getClass().getClassLoader();
+ }
- if (newClassLoader != null) {
- Thread.currentThread().setContextClassLoader(newClassLoader);
++
++ if (effectiveClassLoader != null) {
++ invocation.put(STAGED_CLASSLOADER_KEY, stagedClassLoader);
++ invocation.put(WORKING_CLASSLOADER_KEY, effectiveClassLoader);
+
- Thread.currentThread().setContextClassLoader(effectiveClassLoader);
++ Thread.currentThread().setContextClassLoader(effectiveClassLoader);
+ }
try {
return invoker.invoke(invocation);
} finally {
[dubbo] 02/02: change version to 3.0.6-SNAPSHOT
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit f06bbcc02ce1eec04e37c870e35759183ba93e33
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Dec 27 10:27:49 2021 +0800
change version to 3.0.6-SNAPSHOT
---
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index c3ffc1f..a8c4d52 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -169,7 +169,7 @@
<mortbay_jetty_version>6.1.26</mortbay_jetty_version>
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
- <revision>3.0.5</revision>
+ <revision>3.0.6-SNAPSHOT</revision>
</properties>
<dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 57485c3..afa6b81 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
- <revision>3.0.5</revision>
+ <revision>3.0.6-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
</properties>
diff --git a/pom.xml b/pom.xml
index e16b603..a09f9eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<checkstyle_unix.skip>true</checkstyle_unix.skip>
<rat.skip>true</rat.skip>
<jacoco.skip>true</jacoco.skip>
- <revision>3.0.5</revision>
+ <revision>3.0.6-SNAPSHOT</revision>
</properties>
<modules>