You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by wa...@apache.org on 2023/05/31 03:10:03 UTC
[dubbo] 10/36: Merge remote-tracking branch 'dubbo_rem/master' into master
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit f9c174cd17c736c24d72173b890b4509737cb6d6
Merge: e3fd275030 d70b151e39
Author: Xin Wang <xi...@gmail.com>
AuthorDate: Mon Feb 8 10:28:14 2021 +0800
Merge remote-tracking branch 'dubbo_rem/master' into master
.github/workflows/build-and-test.yml | 185 +++++++
.github/workflows/unit-test.yml | 67 ---
Jenkinsfile | 6 +-
NOTICE | 2 +-
dubbo-all/pom.xml | 14 +
dubbo-bom/pom.xml | 10 +
.../org/apache/dubbo/rpc/cluster/Directory.java | 2 +
.../rpc/cluster/directory/AbstractDirectory.java | 5 +
.../migration/MigrationClusterComparator.java | 20 +-
.../support/migration/MigrationClusterInvoker.java | 54 ++
.../cluster/support/migration/MigrationRule.java | 90 ++++
.../cluster/support/migration/MigrationStep.java | 17 +-
.../support/registry/ZoneAwareClusterInvoker.java | 163 +++++-
.../support/migration/MigrationRuleTest.java | 18 +-
.../common/config/CompositeConfiguration.java | 14 +-
.../dubbo/common/config/ConfigurationUtils.java | 12 +
.../apache/dubbo/common/config/Environment.java | 23 +-
.../dubbo/common/constants/RegistryConstants.java | 9 +-
.../dubbo/config/AbstractInterfaceConfig.java | 11 +-
.../org/apache/dubbo/config/ApplicationConfig.java | 12 +
.../file/FileSystemDynamicConfigurationTest.java | 3 +
.../dubbo/config/bootstrap/DubboBootstrap.java | 14 +
.../bootstrap/DubboBootstrapStartStopListener.java | 24 +-
.../ConfigurableMetadataServiceExporter.java | 53 +-
.../dubbo/config/utils/ConfigValidationUtils.java | 6 +-
.../dubbo/config/bootstrap/rest/UserService.java | 4 +-
.../dubbo/config/url/InvokerSideConfigUrlTest.java | 2 +-
.../org.apache.dubbo.registry.RegistryFactory | 1 +
.../context/DubboBootstrapApplicationListener.java | 1 +
...bboBootstrapStartStopListenerSpringAdapter.java | 48 ++
.../context/event/DubboBootstrapStatedEvent.java | 50 ++
.../context/event/DubboBootstrapStopedEvent.java | 50 ++
...onfig.bootstrap.DubboBootstrapStartStopListener | 1 +
.../MultipleServicesWithMethodConfigsTest.java | 8 +
.../consul/ConsulDynamicConfigurationTest.java | 246 ++++-----
.../zookeeper/ZookeeperDynamicConfiguration.java | 2 +-
.../dubbo-demo-service-consumer}/pom.xml | 41 +-
.../dubbo/demo/consumer/ApplicationConsumer.java | 72 +++
.../consumer/RandomMigrationAddressComparator.java | 52 ++
.../dubbo/demo/consumer/TestFailoverCondition.java | 23 +-
...dubbo.metadata.store.failover.FailoverCondition | 1 +
...er.support.migration.MigrationClusterComparator | 1 +
.../src/main/resources/dubbo.properties | 2 +
.../src/main/resources/log4j.properties | 7 +
.../resources/spring/dubbo-consumer-multiple.xml | 82 +++
.../spring/dubbo-consumer-sofaregistry.xml} | 13 +-
.../resources/spring/dubbo-consumer-zk-apollo.xml} | 19 +-
.../spring/dubbo-consumer-zk-sofaregistry.xml} | 12 +-
.../main/resources/spring/dubbo-consumer-zk.xml} | 13 +-
.../dubbo-demo-service-provider}/pom.xml | 20 +-
.../dubbo/demo/provider/ApplicationProvider.java | 31 ++
.../dubbo/demo/provider/DemoServiceImpl.java | 53 ++
.../dubbo/demo/provider/GreetingServiceImpl.java | 15 +-
.../provider/ServiceDemoMetadataParamsFilter.java | 20 +-
.../dubbo/demo/provider/TestFailoverCondition.java | 23 +-
.../org.apache.dubbo.metadata.MetadataParamsFilter | 1 +
...dubbo.metadata.store.failover.FailoverCondition | 1 +
.../src/main/resources/dubbo.properties | 1 +
.../src/main/resources/log4j.properties | 7 +
.../resources/spring/dubbo-provider-multiple.xml} | 41 +-
.../spring/dubbo-provider-sofaregistry.xml} | 4 +-
.../resources/spring/dubbo-provider-zk-apollo.xml} | 18 +-
.../spring/dubbo-provider-zk-sofaregistry.xml} | 3 +-
.../main/resources/spring/dubbo-provider-zk.xml} | 12 +-
.../dubbo-demo-service-provider2}/pom.xml | 12 +-
.../dubbo/demo/provider/ApplicationProvider2.java | 15 +-
.../dubbo/demo/provider/GreetingServiceImpl.java | 15 +-
.../src/main/resources/dubbo.properties | 1 +
.../src/main/resources/log4j.properties | 7 +
.../main/resources/spring/dubbo-provider-zk.xml} | 8 +-
dubbo-demo/dubbo-demo-service/pom.xml | 69 +++
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 12 +
.../src/main/resources/spring/dubbo-consumer.xml | 78 +--
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 12 +
.../src/main/resources/spring/dubbo-provider.xml | 2 +-
dubbo-demo/pom.xml | 1 +
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../org/apache/dubbo/metadata/MetadataInfo.java | 2 +-
.../{ => dubbo-metadata-report-failover}/pom.xml | 27 +-
.../metadata/store/failover/FailoverCondition.java | 105 ++--
.../store/failover/FailoverMetadataReport.java | 581 +++++++++++++++++++++
.../failover/FailoverMetadataReportFactory.java | 15 +-
.../store/failover/StrategyMetadataReport.java | 88 ++++
...che.dubbo.metadata.report.MetadataReportFactory | 1 +
.../store/failover/FailoverMetadataReportTest.java | 223 ++++++++
.../store/failover/MockAllFailoverCondition.java | 19 +-
.../store/failover/MockLocalFailoverCondition.java | 31 +-
.../store/failover/MockMetadataReport.java | 131 +++++
.../store/failover/MockMetadataReportFactory.java | 16 +-
...che.dubbo.metadata.report.MetadataReportFactory | 1 +
...dubbo.metadata.store.failover.FailoverCondition | 2 +
.../store/zookeeper/ZookeeperMetadataReport.java | 33 +-
dubbo-metadata/pom.xml | 13 +-
.../registry/client/DefaultServiceInstance.java | 2 +-
.../dubbo/registry/client/InstanceAddressURL.java | 3 +
.../dubbo/registry/client/ServiceDiscovery.java | 9 +
.../registry/client/ServiceDiscoveryRegistry.java | 36 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 36 +-
.../listener/ServiceInstancesChangedListener.java | 48 +-
.../registry/client/metadata/MetadataUtils.java | 8 +-
.../StandardMetadataServiceURLBuilder.java | 87 +--
.../store/InMemoryWritableMetadataService.java | 20 +-
.../metadata/store/RemoteMetadataServiceImpl.java | 4 +
.../DefaultMigrationAddressComparator.java | 74 +++
.../client/migration/InvokersChangedListener.java} | 15 +-
.../migration/MigrationAddressComparator.java} | 15 +-
.../client/migration/MigrationInvoker.java | 386 ++++++++++++++
.../client/migration/MigrationRuleHandler.java | 71 +++
.../client/migration/MigrationRuleListener.java | 112 ++++
.../ServiceDiscoveryMigrationInvoker.java | 61 +++
.../registry/integration/DynamicDirectory.java | 118 +++--
.../InterfaceCompatibleRegistryProtocol.java | 134 +----
.../integration/InvokersChangedListener.java} | 13 +-
.../registry/integration/RegistryDirectory.java | 83 ++-
.../{client => integration}/RegistryProtocol.java | 65 ++-
.../integration/RegistryProtocolListener.java | 6 +-
...try.client.migration.MigrationAddressComparator | 1 +
...o.registry.integration.RegistryProtocolListener | 2 +-
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 2 +-
.../java/org/apache/dubbo/registry/ZKTools.java | 20 +-
.../registry/consul/ConsulServiceDiscovery.java | 49 +-
.../ConsulServiceDiscoveryFactory.java~HEAD} | 12 +-
...onsulServiceDiscoveryFactory.java~dubbo-master} | 12 +-
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 8 +-
.../multiple/MultipleRegistryServiceDiscovery.java | 177 +++++++
.../MultipleRegistryServiceDiscoveryFactory.java} | 10 +-
...g.apache.dubbo.registry.client.ServiceDiscovery | 1 +
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../registry/nacos/NacosServiceDiscovery.java | 25 +-
.../sofa/SofaRegistryServiceDiscovery.java | 24 +-
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../zookeeper/ZookeeperServiceDiscovery.java | 52 +-
.../ZookeeperServiceDiscoveryChangeWatcher.java | 18 +-
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../zookeeper/ZookeeperServiceDiscoveryTest.java | 2 +-
dubbo-registry/pom.xml | 14 +-
.../remoting/exchange/codec/ExchangeCodec.java | 86 +--
.../dubbo/remoting/transport/CodecSupport.java | 59 +++
.../dubbo/remoting/zookeeper/ZookeeperClient.java | 2 +
.../zookeeper/support/AbstractZookeeperClient.java | 2 +-
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 4 +-
.../dubbo/rpc/protocol/dubbo/DubboCodec.java | 21 +-
142 files changed, 4224 insertions(+), 1145 deletions(-)