You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by vi...@apache.org on 2019/08/16 09:55:19 UTC
[dubbo] 01/06: test
This is an automated email from the ASF dual-hosted git repository.
victory pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 52329719844abfd2cc84a8c8b37f78264b7dcfcd
Author: cvictory <sh...@gmail.com>
AuthorDate: Fri Aug 16 11:11:34 2019 +0800
test
---
dubbo-bootstrap/pom.xml | 21 ++++-
.../EtcdDubboServiceConsumerBootstrap.java | 58 +++++++++++++
.../EtcdDubboServiceProviderBootstrap.java | 95 ++++++++++++++++++++++
.../NacosDubboServiceConsumerBootstrap.java | 58 +++++++++++++
...ava => NacosDubboServiceProviderBootstrap.java} | 2 +-
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 26 ++++++
6 files changed, 258 insertions(+), 2 deletions(-)
diff --git a/dubbo-bootstrap/pom.xml b/dubbo-bootstrap/pom.xml
index 2566294..7cac061 100644
--- a/dubbo-bootstrap/pom.xml
+++ b/dubbo-bootstrap/pom.xml
@@ -35,6 +35,18 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-registry-etcd3</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>20.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-consul</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
@@ -49,6 +61,13 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-metadata-report-etcd</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
@@ -110,4 +129,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceConsumerBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceConsumerBootstrap.java
new file mode 100644
index 0000000..db4e152
--- /dev/null
+++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceConsumerBootstrap.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.bootstrap;
+
+import org.apache.dubbo.bootstrap.rest.UserService;
+import org.apache.dubbo.config.MetadataReportConfig;
+import org.apache.dubbo.config.ReferenceConfig;
+import org.apache.dubbo.config.context.ConfigManager;
+
+/**
+ * Dubbo Provider Bootstrap
+ *
+ * @since 2.7.4
+ */
+public class EtcdDubboServiceConsumerBootstrap {
+
+ public static void main(String[] args) throws Exception {
+
+ new DubboBootstrap()
+ .application("dubbo-consumer-demo")
+ // Zookeeper
+ .registry("zookeeper", builder -> builder.address("etcd3://127.0.0.1:2379?registry.type=service&subscribed.services=dubbo-provider-demo"))
+ .metadataReport(new MetadataReportConfig("etcd://127.0.0.1:2379"))
+ // Nacos
+// .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1"))
+ .reference("echo", builder -> builder.interfaceClass(EchoService.class).protocol("dubbo"))
+ .reference("user", builder -> builder.interfaceClass(UserService.class).protocol("rest"))
+ .onlyRegisterProvider(true)
+ .start()
+ .await();
+
+ ConfigManager configManager = ConfigManager.getInstance();
+
+ ReferenceConfig<EchoService> referenceConfig = configManager.getReference("echo");
+
+ EchoService echoService = referenceConfig.get();
+
+ for (int i = 0; i < 500; i++) {
+ Thread.sleep(2000L);
+ System.out.println(echoService.echo("Hello,World"));
+ }
+
+ }
+}
diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceProviderBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceProviderBootstrap.java
new file mode 100644
index 0000000..d488ec6
--- /dev/null
+++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EtcdDubboServiceProviderBootstrap.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.bootstrap;
+
+import org.apache.dubbo.bootstrap.rest.UserService;
+import org.apache.dubbo.bootstrap.rest.UserServiceImpl;
+import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.MetadataReportConfig;
+import org.apache.dubbo.config.ProtocolConfig;
+import org.apache.dubbo.config.RegistryConfig;
+import org.apache.dubbo.config.ServiceConfig;
+
+import java.util.Arrays;
+
+/**
+ * Dubbo Provider Bootstrap
+ *
+ * @since 2.7.4
+ */
+public class EtcdDubboServiceProviderBootstrap {
+
+ public static void main(String[] args) {
+ multipleRegistries();
+ }
+
+ private static void multipleRegistries() {
+ ProtocolConfig restProtocol = new ProtocolConfig();
+ restProtocol.setName("rest");
+ restProtocol.setId("rest");
+ restProtocol.setPort(-1);
+
+ RegistryConfig interfaceRegistry = new RegistryConfig();
+ interfaceRegistry.setId("interfaceRegistry");
+ interfaceRegistry.setAddress("etcd3://127.0.0.1:2379");
+
+ RegistryConfig serviceRegistry = new RegistryConfig();
+ serviceRegistry.setId("serviceRegistry");
+ serviceRegistry.setAddress("etcd3://127.0.0.1:2379?registry.type=service");
+
+ ServiceConfig<EchoService> echoService = new ServiceConfig<>();
+ echoService.setInterface(EchoService.class.getName());
+ echoService.setRef(new EchoServiceImpl());
+// echoService.setRegistries(Arrays.asList(interfaceRegistry, serviceRegistry));
+
+ ServiceConfig<UserService> userService = new ServiceConfig<>();
+ userService.setInterface(UserService.class.getName());
+ userService.setRef(new UserServiceImpl());
+ userService.setProtocol(restProtocol);
+// userService.setRegistries(Arrays.asList(interfaceRegistry, serviceRegistry));
+
+ ApplicationConfig applicationConfig = new ApplicationConfig("dubbo-provider-demo");
+ applicationConfig.setMetadata("remote");
+ new DubboBootstrap()
+ .application(applicationConfig)
+ // Zookeeper in service registry type
+// .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service"))
+ // Nacos
+// .registry("zookeeper", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service"))
+ .registries(Arrays.asList(interfaceRegistry, serviceRegistry))
+// .registry(RegistryBuilder.newBuilder().address("consul://127.0.0.1:8500?registry.type=service").build())
+ .protocol(builder -> builder.port(-1).name("dubbo"))
+ .metadataReport(new MetadataReportConfig("etcd://127.0.0.1:2379"))
+ .service(echoService)
+ .service(userService)
+ .start()
+ .await();
+ }
+
+ private static void testSCCallDubbo() {
+
+ }
+
+ private static void testDubboCallSC() {
+
+ }
+
+ private static void testDubboTansormation() {
+
+ }
+
+}
diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/NacosDubboServiceConsumerBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/NacosDubboServiceConsumerBootstrap.java
new file mode 100644
index 0000000..3f57736
--- /dev/null
+++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/NacosDubboServiceConsumerBootstrap.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.bootstrap;
+
+import org.apache.dubbo.bootstrap.rest.UserService;
+import org.apache.dubbo.config.MetadataReportConfig;
+import org.apache.dubbo.config.ReferenceConfig;
+import org.apache.dubbo.config.context.ConfigManager;
+
+/**
+ * Dubbo Provider Bootstrap
+ *
+ * @since 2.7.4
+ */
+public class NacosDubboServiceConsumerBootstrap {
+
+ public static void main(String[] args) throws Exception {
+
+ new DubboBootstrap()
+ .application("dubbo-consumer-demo")
+ // Zookeeper
+ .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service&subscribed.services=dubbo-provider-demo"))
+ .metadataReport(new MetadataReportConfig("zookeeper://127.0.0.1:2181"))
+ // Nacos
+// .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1"))
+ .reference("echo", builder -> builder.interfaceClass(EchoService.class).protocol("dubbo"))
+ .reference("user", builder -> builder.interfaceClass(UserService.class).protocol("rest"))
+ .onlyRegisterProvider(true)
+ .start()
+ .await();
+
+ ConfigManager configManager = ConfigManager.getInstance();
+
+ ReferenceConfig<EchoService> referenceConfig = configManager.getReference("echo");
+
+ EchoService echoService = referenceConfig.get();
+
+ for (int i = 0; i < 500; i++) {
+ Thread.sleep(2000L);
+ System.out.println(echoService.echo("Hello,World"));
+ }
+
+ }
+}
diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/NacosDubboServiceProviderBootstrap.java
similarity index 97%
rename from dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java
rename to dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/NacosDubboServiceProviderBootstrap.java
index ad87adb..c631aa1 100644
--- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProvider2Bootstrap.java
+++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/NacosDubboServiceProviderBootstrap.java
@@ -21,7 +21,7 @@ package org.apache.dubbo.bootstrap;
*
* @since 2.7.4
*/
-public class DubboServiceProvider2Bootstrap {
+public class NacosDubboServiceProviderBootstrap {
public static void main(String[] args) {
new DubboBootstrap()
diff --git a/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java b/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
index a684c2c..612e34c 100644
--- a/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
@@ -19,10 +19,12 @@ package org.apache.dubbo.registry.etcd;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.event.EventDispatcher;
import org.apache.dubbo.event.EventListener;
import org.apache.dubbo.registry.NotifyListener;
+import org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceDiscovery;
import org.apache.dubbo.registry.client.ServiceInstance;
import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent;
@@ -37,13 +39,17 @@ import org.apache.dubbo.rpc.RpcException;
import com.google.gson.Gson;
import java.io.File;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import static org.apache.dubbo.common.constants.RegistryConstants.DYNAMIC_KEY;
+
/**
* 2019-07-08
*/
@@ -101,6 +107,7 @@ public class EtcdServiceDiscovery implements ServiceDiscovery, EventListener<Ser
try {
this.serviceInstance = serviceInstance;
String path = toPath(serviceInstance);
+// etcdClient.createEphemeral(path);
etcdClient.putEphemeral(path, new Gson().toJson(serviceInstance));
services.add(serviceInstance.getServiceName());
} catch (Throwable e) {
@@ -116,6 +123,10 @@ public class EtcdServiceDiscovery implements ServiceDiscovery, EventListener<Ser
+ ":" + serviceInstance.getPort();
}
+ String toParentPath(String serviceName) {
+ return root + File.separator + serviceName;
+ }
+
@Override
public void update(ServiceInstance serviceInstance) throws RuntimeException {
try {
@@ -153,6 +164,21 @@ public class EtcdServiceDiscovery implements ServiceDiscovery, EventListener<Ser
dispatcher.addEventListener(listener);
}
+ @Override
+ public List<ServiceInstance> getInstances(String serviceName) {
+ List<String> children = etcdClient.getChildren(toParentPath(serviceName));
+ if (CollectionUtils.isEmpty(children)) {
+ return Collections.EMPTY_LIST;
+ }
+ List<ServiceInstance> list = new ArrayList<>(children.size());
+ for (String child : children) {
+ ServiceInstance serviceInstance = new Gson().fromJson(etcdClient.getKVValue(child), DefaultServiceInstance.class);
+ list.add(serviceInstance);
+ }
+ return list;
+ }
+
+
protected void registerServiceWatcher(String serviceName) {
String path = root + File.separator + serviceName;
/*