You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2018/10/24 03:04:05 UTC
[incubator-dubbo] branch dev-metadata updated (37c22c7 -> ac13330)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from 37c22c7 Merge pull request #2672, simplify registry url: rename servicestore to metada & enhancements.
new de32524 Change the default root directory of zookeeper config center from '/dubbo/config' to '/dubbo'.
new 413ed71 test registry group
new 2f9dcf1 Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata
new 8839c9b Ignore invalid configurators
new ac13330 Rename MetadataReportFactory SPI config files
The 5 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:
.../META-INF/spring/dubbo-demo-consumer.xml | 4 ++--
.../META-INF/spring/dubbo-demo-provider.xml | 3 +--
dubbo-dependencies-bom/pom.xml | 1 -
dubbo-governance/dubbo-governance-zookeeper/pom.xml | 5 -----
.../sources/ZooKeeperConfigurationSource.java | 6 +++++-
...ache.dubbo.metadata.store.MetadataReportFactory} | 0
...ache.dubbo.metadata.store.MetadataReportFactory} | 0
.../registry/integration/RegistryDirectory.java | 9 +++++++--
.../registry/integration/RegistryProtocol.java | 21 +++++++++++++++++++--
9 files changed, 34 insertions(+), 15 deletions(-)
rename dubbo-metadata-report/dubbo-metadata-report-redis/src/main/resources/META-INF/dubbo/internal/{org.apache.dubbo.servicedata.store.ServiceStoreFactory => org.apache.dubbo.metadata.store.MetadataReportFactory} (100%)
rename dubbo-metadata-report/dubbo-metadata-report-zookeeper/src/main/resources/META-INF/dubbo/internal/{org.apache.dubbo.servicedata.store.ServiceStoreFactory => org.apache.dubbo.metadata.store.MetadataReportFactory} (100%)
[incubator-dubbo] 05/05: Rename MetadataReportFactory SPI config
files
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit ac13330434ee4f9b78065093ac11b53c85cf69b6
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Oct 24 11:03:53 2018 +0800
Rename MetadataReportFactory SPI config files
---
...StoreFactory => org.apache.dubbo.metadata.store.MetadataReportFactory} | 0
...StoreFactory => org.apache.dubbo.metadata.store.MetadataReportFactory} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/dubbo-metadata-report/dubbo-metadata-report-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.servicedata.store.ServiceStoreFactory b/dubbo-metadata-report/dubbo-metadata-report-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.MetadataReportFactory
similarity index 100%
rename from dubbo-metadata-report/dubbo-metadata-report-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.servicedata.store.ServiceStoreFactory
rename to dubbo-metadata-report/dubbo-metadata-report-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.MetadataReportFactory
diff --git a/dubbo-metadata-report/dubbo-metadata-report-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.servicedata.store.ServiceStoreFactory b/dubbo-metadata-report/dubbo-metadata-report-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.MetadataReportFactory
similarity index 100%
rename from dubbo-metadata-report/dubbo-metadata-report-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.servicedata.store.ServiceStoreFactory
rename to dubbo-metadata-report/dubbo-metadata-report-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.MetadataReportFactory
[incubator-dubbo] 02/05: test registry group
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 413ed71defe34fe32d1489413ab7b48d1e9a715b
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Oct 24 09:42:38 2018 +0800
test registry group
---
.../src/main/resources/META-INF/spring/dubbo-demo-consumer.xml | 4 ++--
.../src/main/resources/META-INF/spring/dubbo-demo-provider.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml b/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
index 0216a13..97a8031 100644
--- a/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
+++ b/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
@@ -30,8 +30,8 @@
</dubbo:application>
<!-- use multicast registry center to discover service -->
- <dubbo:registry address="zookeeper://127.0.0.1:2181" default="true"/>
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181" default="true"/>
+ <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181"/>
<dubbo:servicestore address="zookeeper://127.0.0.1:2181"/>
diff --git a/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml b/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
index bdf633f..01ccd6f 100644
--- a/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
+++ b/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
@@ -26,7 +26,7 @@
<!--<dubbo:provider tag="tag3"/>-->
<!-- use multicast registry center to export service -->
- <dubbo:registry address="zookeeper://127.0.0.1:2181" simple="false">
+ <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181" simple="false">
<dubbo:parameter key="config.check" value="false"/>
</dubbo:registry>
[incubator-dubbo] 01/05: Change the default root directory of
zookeeper config center from '/dubbo/config' to '/dubbo'.
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit de32524b044921be2c7087c1501c32bee9b15a73
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Oct 24 09:42:20 2018 +0800
Change the default root directory of zookeeper config center from '/dubbo/config' to '/dubbo'.
---
.../archaius/sources/ZooKeeperConfigurationSource.java | 2 +-
.../apache/dubbo/registry/integration/RegistryProtocol.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java b/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java
index 1559572..0da40ea 100644
--- a/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java
+++ b/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java
@@ -49,7 +49,7 @@ public class ZooKeeperConfigurationSource implements WatchedConfigurationSource,
public static final String ARCHAIUS_SOURCE_ADDRESS_KEY = "archaius.zk.address";
public static final String ARCHAIUS_CONFIG_ROOT_PATH_KEY = "archaius.zk.rootpath";
public static final String ARCHAIUS_CONFIG_CHECK_KEY = "archaius.zk.check";
- public static final String DEFAULT_CONFIG_ROOT_PATH = "/dubbo/config";
+ public static final String DEFAULT_CONFIG_ROOT_PATH = "/dubbo";
private static final Logger logger = LoggerFactory.getLogger(ZooKeeperConfigurationSource.class);
private Executor executor = Executors.newFixedThreadPool(1);
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
index bdafccd..764b873 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -202,6 +202,13 @@ public class RegistryProtocol implements Protocol {
return providerUrl;
}
+ /**
+ * generate a url contains configuration items for config center.
+ * if no configuration item found, use registry url instead.
+ *
+ * @param registryUrl
+ * @return
+ */
private URL getConfigUrl(URL registryUrl) {
Map<String, String> qs = StringUtils.parseQueryString(registryUrl.getParameterAndDecoded(REFER_KEY));
URL url = registryUrl
@@ -217,6 +224,11 @@ public class RegistryProtocol implements Protocol {
if (StringUtils.isNotEmpty(configAddress)) {
url = url.setAddress(configAddress);
}
+
+ String configNamespace = registryUrl.getParameter(Constants.CONFIG_NAMESPACE_KEY);
+ if (StringUtils.isEmpty(configNamespace)) {
+ url = url.addParameter(Constants.CONFIG_NAMESPACE_KEY, registryUrl.getParameter(Constants.GROUP_KEY, Constants.DEFAULT_PROTOCOL));
+ }
return url;
}
[incubator-dubbo] 03/05: Merge branch 'dev-metadata' of
https://github.com/apache/incubator-dubbo into dev-metadata
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 2f9dcf1eb5916c5ae569599df867fa08b04845be
Merge: 413ed71 37c22c7
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Oct 24 10:00:02 2018 +0800
Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata
dubbo-bom/pom.xml | 6 +-
.../java/org/apache/dubbo/common/Constants.java | 2 +-
dubbo-config/dubbo-config-api/pom.xml | 2 +-
.../dubbo/config/AbstractInterfaceConfig.java | 10 +--
.../org/apache/dubbo/config/ReferenceConfig.java | 8 +-
.../org/apache/dubbo/config/ServiceConfig.java | 8 +-
.../apache/dubbo/config/spring/ReferenceBean.java | 2 +-
.../apache/dubbo/config/spring/ServiceBean.java | 2 +-
.../src/main/resources/META-INF/compat/dubbo.xsd | 2 +-
.../src/main/resources/META-INF/dubbo.xsd | 2 +-
dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +-
.../META-INF/spring/dubbo-demo-consumer.xml | 2 +-
dubbo-demo/dubbo-demo-provider/pom.xml | 4 +-
.../dubbo-metadata-report-api}/pom.xml | 8 +-
.../integration/MetadataReportService.java | 37 +++++----
.../dubbo/metadata}/metadata/MethodDescriptor.java | 2 +-
.../metadata}/metadata/ServiceDescriptor.java | 2 +-
.../dubbo/metadata}/metadata/TypeDescriptor.java | 2 +-
.../metadata/builder/ArrayTypeBuilder.java | 4 +-
.../metadata/builder/CollectionTypeBuilder.java | 4 +-
.../metadata/builder/DefaultTypeBuilder.java | 4 +-
.../metadata/builder/EnumTypeBuilder.java | 4 +-
.../metadata}/metadata/builder/MapTypeBuilder.java | 4 +-
.../metadata/builder/ServiceDescriptorBuilder.java | 8 +-
.../metadata}/metadata/builder/TypeBuilder.java | 4 +-
.../metadata/builder/TypeDescriptorBuilder.java | 4 +-
.../dubbo/metadata/store/MetadataReport.java | 4 +-
.../metadata/store/MetadataReportFactory.java | 6 +-
.../metadata/support/AbstractMetadataReport.java | 33 ++++++--
.../support/AbstractMetadataReportFactory.java | 36 ++++----
.../integration/InterfaceNameTestService.java | 2 +-
.../integration/InterfaceNameTestService2.java | 2 +-
.../integration/MetadataReportServiceTest.java | 96 +++++++++++-----------
.../metadata/builder/ArrayTypeBuilderTest.java | 12 ++-
.../builder/CollectionTypeBuilderTest.java | 11 ++-
.../metadata}/metadata/builder/ComplexEnum.java | 2 +-
.../metadata}/metadata/builder/ComplexObject.java | 2 +-
.../metadata/builder/DefaultTypeBuilderTest.java | 6 +-
.../metadata/builder/EnumTypeBuilderTest.java | 15 ++--
.../metadata/builder/MapTypeBuilderTest.java | 11 ++-
.../builder/ServiceDescriptorBuilderTest.java | 4 +-
.../metadata}/metadata/builder/SingleEnum.java | 2 +-
.../metadata}/metadata/builder/TestService.java | 2 +-
.../builder/TypeDescriptorBuilderTest.java | 8 +-
.../store/test/JTestMetadataReport4Test.java | 14 ++--
.../test/JTestMetadataReportFactory4Test.java | 12 +--
.../support/AbstractMetadataReportFactoryTest.java | 36 ++++----
.../support/AbstractMetadataReportTest.java | 31 ++++---
...che.dubbo.servicedata.store.ServiceStoreFactory | 1 +
.../dubbo-metadata-report-redis}/pom.xml | 6 +-
.../metadata/store/redis/RedisMetadataReport.java | 35 ++------
.../store/redis/RedisMetadataReportFactory.java | 12 +--
...che.dubbo.servicedata.store.ServiceStoreFactory | 1 +
.../store/redis/RedisMetadataReportTest.java | 33 +++-----
.../dubbo-metadata-report-zookeeper}/pom.xml | 6 +-
.../store/zookeeper/ZookeeperMetadataReport.java | 14 ++--
.../zookeeper/ZookeeperMetadataReportFactory.java | 12 +--
...che.dubbo.servicedata.store.ServiceStoreFactory | 1 +
.../zookeeper/ZookeeperMetadataReportTest.java | 45 +++++-----
.../pom.xml | 8 +-
...che.dubbo.servicedata.store.ServiceStoreFactory | 1 -
...che.dubbo.servicedata.store.ServiceStoreFactory | 1 -
...che.dubbo.servicedata.store.ServiceStoreFactory | 1 -
pom.xml | 2 +-
64 files changed, 331 insertions(+), 334 deletions(-)
diff --cc dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
index 97a8031,578b324..167e0df
--- a/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
+++ b/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml
@@@ -30,10 -30,10 +30,10 @@@
</dubbo:application>
<!-- use multicast registry center to discover service -->
- <dubbo:registry address="zookeeper://127.0.0.1:2181" default="true"/>
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181" default="true"/>
+ <dubbo:registry group="dubboregistrygroup1" address="zookeeper://127.0.0.1:2181"/>
- <dubbo:servicestore address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:servicestore address="redis://127.0.0.1:6379"/>
<!-- generate proxy for the remote service, then demoService can be used in the same way as the
local regular interface -->
[incubator-dubbo] 04/05: Ignore invalid configurators
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 8839c9b2067a6fb3cc53c9f76463370a0dbb9efa
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Oct 24 11:03:11 2018 +0800
Ignore invalid configurators
---
dubbo-dependencies-bom/pom.xml | 1 -
dubbo-governance/dubbo-governance-zookeeper/pom.xml | 5 -----
.../support/archaius/sources/ZooKeeperConfigurationSource.java | 4 ++++
.../org/apache/dubbo/registry/integration/RegistryDirectory.java | 9 +++++++--
.../org/apache/dubbo/registry/integration/RegistryProtocol.java | 9 +++++++--
5 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 4cd3a04..1c4cbc5 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -378,7 +378,6 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${commons_configuration_version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/dubbo-governance/dubbo-governance-zookeeper/pom.xml b/dubbo-governance/dubbo-governance-zookeeper/pom.xml
index 55b7bba..2e5c61a 100644
--- a/dubbo-governance/dubbo-governance-zookeeper/pom.xml
+++ b/dubbo-governance/dubbo-governance-zookeeper/pom.xml
@@ -34,11 +34,6 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-remoting-zookeeper</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
<groupId>com.netflix.archaius</groupId>
<artifactId>archaius-core</artifactId>
</dependency>
diff --git a/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java b/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java
index 0da40ea..7a96c4d 100644
--- a/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java
+++ b/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java
@@ -77,6 +77,10 @@ public class ZooKeeperConfigurationSource implements WatchedConfigurationSource,
throw new IllegalArgumentException("connectString==null, must specify the address to connect for zookeeper archaius source.");
}
+ if (!configRootPath.startsWith("/")) {
+ configRootPath = "/" + configRootPath;
+ }
+
CuratorFramework client = CuratorFrameworkFactory.newClient(connectString, sessionTimeout, connectTimeout,
new ExponentialBackoffRetry(1000, 3));
client.start();
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
index 09e82fd..6c51eb7 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -170,8 +170,13 @@ public class RegistryDirectory<T> extends AbstractDirectory<T> implements Notify
if (StringUtils.isEmpty(rawConfig)) {
return new LinkedList<>();
}
- List<URL> urls = ConfigParser.parseConfigurators(rawConfig);
- return urls.stream().map(configuratorFactory::getConfigurator).collect(Collectors.toList());
+ try {
+ List<URL> urls = ConfigParser.parseConfigurators(rawConfig);
+ return urls.stream().map(configuratorFactory::getConfigurator).collect(Collectors.toList());
+ } catch (Exception e) {
+ logger.error("Failed to parse raw dynamic config and it will not take effect, the raw config is: " + rawConfig, e);
+ }
+ return new LinkedList<>();
}
public void setProtocol(Protocol protocol) {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
index 764b873..7003a4c 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -616,8 +616,13 @@ public class RegistryProtocol implements Protocol {
urls = new ArrayList<>();
urls.add(originUrl);
} else {
- // parseConfigurators will recognize app/service config automatically.
- urls = ConfigParser.parseConfigurators(event.getNewValue());
+ try {
+ // parseConfigurators will recognize app/service config automatically.
+ urls = ConfigParser.parseConfigurators(event.getNewValue());
+ } catch (Exception e) {
+ logger.error("Failed to parse raw dynamic config and it will not take effect, the raw config is: " + event.getNewValue(), e);
+ return;
+ }
}
notify(urls);
}