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/28 06:24:56 UTC
[dubbo] branch 3.2 updated (b67db81e2e -> 4de9672008)
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 b67db81e2e client flowcontrol (#11029)
add 1f1995ac8c Fix logger in ClassLoaderResourceLoader (#10995)
add 151b4a9514 XSD file append prefer-serialization (#10998)
add 0945e4e424 Revert "XSD file append prefer-serialization (#10998)" (#11003)
add 5d9638dd5e fix log (#11000)
add 791918c471 Error code is managed with constants (#10771) (#11016)
add 0e95ac4e39 Enhance unit test cases (#11034)
add b860358b94 Fixed metrics collection getting wrong method name when generalize called (#11012)
add 4c52ac0a3b Fix zookeeper cas failed when create (#11036)
add d192c7bfde revert grpc header (#11035)
add ff59343557 Merge remote-tracking branch 'apache/3.0' into apache-3.1
add 973e78db54 Fix license
new 4de9672008 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:
.licenserc.yaml | 1 +
.../file/FileSystemDynamicConfiguration.java | 57 ++--
.../common/constants/LoggerCodeConstants.java | 11 +-
.../threadpool/serial/SerializingExecutor.java | 11 +-
.../common/utils/ClassLoaderResourceLoader.java | 10 +-
.../org/apache/dubbo/config/ProtocolConfig.java | 3 +-
.../common/logger/support/FailsafeLoggerTest.java | 33 +--
.../dubbo/config/utils/ConfigValidationUtils.java | 5 +-
.../dubbo/config/bootstrap/MultiInstanceTest.java | 32 +--
.../config/utils/ConfigValidationUtilsTest.java | 5 +-
.../AbstractAnnotationBeanPostProcessor.java | 30 +-
.../ReferenceAnnotationBeanPostProcessor.java | 24 +-
.../context/DubboBootstrapApplicationListener.java | 15 +-
.../context/DubboConfigApplicationListener.java | 10 +-
.../spring/context/DubboConfigBeanInitializer.java | 6 +-
.../spring/reference/ReferenceBeanManager.java | 22 +-
.../config/spring/reference/ReferenceCreator.java | 6 +-
.../dubbo/config/spring/EmbeddedZooKeeper.java | 6 +-
.../support/apollo/EmbeddedApolloJunit5.java | 10 +-
.../zookeeper/ZookeeperDynamicConfiguration.java | 5 +-
.../kubernetes/KubernetesServiceDiscoveryTest.java | 21 +-
.../report/support/AbstractMetadataReport.java | 23 ++
.../report/support/AbstractMetadataReportTest.java | 60 ++--
.../metadata/store/nacos/NacosMetadataReport.java | 2 +-
.../metadata/store/redis/RedisMetadataReport.java | 35 ++-
.../store/zookeeper/ZookeeperMetadataReport.java | 8 +-
.../metrics/filter/MetricsCollectExecutor.java | 8 +
.../dubbo/metrics/filter/MetricsFilterTest.java | 26 ++
.../apache/dubbo/monitor/dubbo/MetricsFilter.java | 7 +-
.../dubbo/monitor/dubbo/DubboMonitorTest.java | 100 +++----
.../dubbo/monitor/dubbo/MockMonitorService.java | 10 +-
.../dubbo/registry/PerformanceRegistryTest.java | 11 +-
.../migration/MigrationRuleListenerTest.java | 57 ++--
.../registry/zookeeper/ZookeeperRegistry.java | 6 +-
.../zookeeper/AbstractZookeeperClient.java | 40 +--
.../dubbo/remoting/zookeeper/ZookeeperClient.java | 16 +-
.../apache/dubbo/remoting/ChanelHandlerTest.java | 11 +-
.../dubbo/remoting/PerformanceClientCloseTest.java | 13 +-
.../dubbo/remoting/PerformanceClientFixedTest.java | 9 +-
.../dubbo/remoting/PerformanceClientTest.java | 9 +-
.../dubbo/remoting/PerformanceServerTest.java | 15 +-
.../remoting/codec/DeprecatedExchangeCodec.java | 17 +-
.../remoting/codec/DeprecatedTelnetCodec.java | 17 +-
.../curator5/Curator5ZookeeperClient.java | 103 +++++--
.../curator5/Curator5ZookeeperClientTest.java | 300 ++++++++++++++++++--
.../zookeeper/curator/CuratorZookeeperClient.java | 101 +++++--
.../curator/CuratorZookeeperClientTest.java | 303 +++++++++++++++++++--
.../protocol/tri/stream/TripleClientStream.java | 20 +-
.../event/WelcomeLogoApplicationListener.java | 5 +-
pom.xml | 10 +
50 files changed, 1250 insertions(+), 415 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 4de9672008cd3ea8502a86b5f45159b300d58a92
Merge: b67db81e2e 973e78db54
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Nov 28 14:24:34 2022 +0800
Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
# .licenserc.yaml
# dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
# dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
# dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/TripleClientStream.java
.licenserc.yaml | 1 +
.../file/FileSystemDynamicConfiguration.java | 57 ++--
.../common/constants/LoggerCodeConstants.java | 11 +-
.../threadpool/serial/SerializingExecutor.java | 11 +-
.../common/utils/ClassLoaderResourceLoader.java | 10 +-
.../org/apache/dubbo/config/ProtocolConfig.java | 3 +-
.../common/logger/support/FailsafeLoggerTest.java | 33 +--
.../dubbo/config/utils/ConfigValidationUtils.java | 5 +-
.../dubbo/config/bootstrap/MultiInstanceTest.java | 32 +--
.../config/utils/ConfigValidationUtilsTest.java | 5 +-
.../AbstractAnnotationBeanPostProcessor.java | 30 +-
.../ReferenceAnnotationBeanPostProcessor.java | 24 +-
.../context/DubboBootstrapApplicationListener.java | 15 +-
.../context/DubboConfigApplicationListener.java | 10 +-
.../spring/context/DubboConfigBeanInitializer.java | 6 +-
.../spring/reference/ReferenceBeanManager.java | 22 +-
.../config/spring/reference/ReferenceCreator.java | 6 +-
.../dubbo/config/spring/EmbeddedZooKeeper.java | 6 +-
.../support/apollo/EmbeddedApolloJunit5.java | 10 +-
.../zookeeper/ZookeeperDynamicConfiguration.java | 5 +-
.../kubernetes/KubernetesServiceDiscoveryTest.java | 21 +-
.../report/support/AbstractMetadataReport.java | 23 ++
.../report/support/AbstractMetadataReportTest.java | 60 ++--
.../metadata/store/nacos/NacosMetadataReport.java | 2 +-
.../metadata/store/redis/RedisMetadataReport.java | 35 ++-
.../store/zookeeper/ZookeeperMetadataReport.java | 8 +-
.../metrics/filter/MetricsCollectExecutor.java | 8 +
.../dubbo/metrics/filter/MetricsFilterTest.java | 26 ++
.../apache/dubbo/monitor/dubbo/MetricsFilter.java | 7 +-
.../dubbo/monitor/dubbo/DubboMonitorTest.java | 100 +++----
.../dubbo/monitor/dubbo/MockMonitorService.java | 10 +-
.../dubbo/registry/PerformanceRegistryTest.java | 11 +-
.../migration/MigrationRuleListenerTest.java | 57 ++--
.../registry/zookeeper/ZookeeperRegistry.java | 6 +-
.../zookeeper/AbstractZookeeperClient.java | 40 +--
.../dubbo/remoting/zookeeper/ZookeeperClient.java | 16 +-
.../apache/dubbo/remoting/ChanelHandlerTest.java | 11 +-
.../dubbo/remoting/PerformanceClientCloseTest.java | 13 +-
.../dubbo/remoting/PerformanceClientFixedTest.java | 9 +-
.../dubbo/remoting/PerformanceClientTest.java | 9 +-
.../dubbo/remoting/PerformanceServerTest.java | 15 +-
.../remoting/codec/DeprecatedExchangeCodec.java | 17 +-
.../remoting/codec/DeprecatedTelnetCodec.java | 17 +-
.../curator5/Curator5ZookeeperClient.java | 103 +++++--
.../curator5/Curator5ZookeeperClientTest.java | 300 ++++++++++++++++++--
.../zookeeper/curator/CuratorZookeeperClient.java | 101 +++++--
.../curator/CuratorZookeeperClientTest.java | 303 +++++++++++++++++++--
.../protocol/tri/stream/TripleClientStream.java | 20 +-
.../event/WelcomeLogoApplicationListener.java | 5 +-
pom.xml | 10 +
50 files changed, 1250 insertions(+), 415 deletions(-)
diff --cc .licenserc.yaml
index 561562b7f0,04f643df2f..8eb8d8d265
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@@ -76,8 -76,7 +76,9 @@@ header
- 'dubbo-common/src/main/java/org/apache/dubbo/common/utils/CIDRUtils.java'
- 'dubbo-common/src/main/java/org/apache/dubbo/common/utils/Utf8Utils.java'
- 'dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/EmbeddedZooKeeper.java'
+ - 'dubbo-test/dubbo-test-common/src/main/java/org/apache/dubbo/test/common/utils/TestSocketUtils.java'
+ - 'dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java'
+ - 'dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/serial/SerializingExecutor.java'
comment: on-failure
diff --cc dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
index 31d7db105c,9960e6731e..801333217e
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
@@@ -61,9 -62,9 +62,9 @@@ import static org.springframework.core.
* Abstract common {@link BeanPostProcessor} implementation for customized annotation that annotated injected-object.
*/
@SuppressWarnings("unchecked")
-public abstract class AbstractAnnotationBeanPostProcessor extends
- InstantiationAwareBeanPostProcessorAdapter implements MergedBeanDefinitionPostProcessor,
+public abstract class AbstractAnnotationBeanPostProcessor implements
+ InstantiationAwareBeanPostProcessor, MergedBeanDefinitionPostProcessor,
- BeanFactoryAware, BeanClassLoaderAware, EnvironmentAware, DisposableBean {
+ BeanFactoryAware, BeanClassLoaderAware, EnvironmentAware, DisposableBean {
private final static int CACHE_SIZE = Integer.getInteger("", 32);
diff --cc dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
index 988082f32f,be855881bc..adee70d4cf
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
@@@ -521,7 -510,8 +524,8 @@@ public class ReferenceAnnotationBeanPos
/**
* Gets all beans of {@link ReferenceBean}
+ *
- * @deprecated use {@link ReferenceBeanManager.getReferences()} instead
+ * @deprecated use {@link ReferenceBeanManager#getReferences()} instead
*/
@Deprecated
public Collection<ReferenceBean<?>> getReferenceBeans() {
diff --cc dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/TripleClientStream.java
index 496b12ebd0,e102426580..fe20f20d98
--- 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
@@@ -64,21 -62,18 +66,21 @@@ import static org.apache.dubbo.common.c
*/
public class TripleClientStream extends AbstractStream implements ClientStream {
- private static final Logger LOGGER = LoggerFactory.getLogger(TripleClientStream.class);
+ private static final ErrorTypeAwareLogger LOGGER = LoggerFactory.getErrorTypeAwareLogger(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,
- Executor executor,
- TripleWriteQueue writeQueue,
- ClientStream.Listener listener,
+ Executor executor,
- WriteQueue writeQueue,
- ClientStream.Listener listener) {
++ TripleWriteQueue writeQueue,
++ ClientStream.Listener listener,
+ Http2StreamChannel http2StreamChannel) {
super(executor, frameworkModel);
this.parent = null;
this.listener = listener;
@@@ -87,10 -81,9 +89,10 @@@
}
public TripleClientStream(FrameworkModel frameworkModel,
- Executor executor,
- Channel parent,
- ClientStream.Listener listener,
+ Executor executor,
+ Channel parent,
- ClientStream.Listener listener) {
++ ClientStream.Listener listener,
+ TripleWriteQueue writeQueue) {
super(executor, frameworkModel);
this.parent = parent;
this.listener = listener;