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
The following commit(s) were added to refs/heads/3.0 by this push:
new c6e4279 fix MetadataService port conflict (#9184)
c6e4279 is described below
commit c6e427987013e1b32f205e88cb9c60adb4f0f4b2
Author: huazhongming <[email protected]>
AuthorDate: Thu Nov 4 16:57:19 2021 +0800
fix MetadataService port conflict (#9184)
---
.../java/org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../src/main/resources/spring/dubbo-consumer.properties | 1 +
.../src/main/resources/spring/dubbo-provider.properties | 2 +-
.../org/apache/dubbo/demo/consumer/Application.java | 13 ++++++++-----
.../org/apache/dubbo/demo/provider/Application.java | 3 +++
.../apache/dubbo/demo/consumer/GenericApplication.java | 2 ++
.../apache/dubbo/demo/graalvm/consumer/Application.java | 17 ++++++++++-------
.../apache/dubbo/demo/graalvm/provider/Application.java | 15 +++++++++------
.../org/apache/dubbo/demo/consumer/ApiConsumer.java | 12 +++++++-----
.../apache/dubbo/demo/consumer/ApiWrapperConsumer.java | 9 ++++++---
.../org/apache/dubbo/demo/provider/ApiProvider.java | 10 +++++-----
.../apache/dubbo/demo/provider/ApiWrapperProvider.java | 10 +++++-----
.../src/main/resources/spring/dubbo-consumer.xml | 4 ++++
13 files changed, 62 insertions(+), 38 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 60b7fc8..f247614 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -721,7 +721,7 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
private Integer findConfigedPorts(ProtocolConfig protocolConfig,
String name,
Map<String, String> map) {
- Integer portToBind = null;
+ Integer portToBind;
// parse bind port from environment
String port = getValueFromConfig(protocolConfig, DUBBO_PORT_TO_BIND);
diff --git
a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/src/main/resources/spring/dubbo-consumer.properties
b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/src/main/resources/spring/dubbo-consumer.properties
index bda13ad..151fc03 100644
---
a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/src/main/resources/spring/dubbo-consumer.properties
+++
b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/src/main/resources/spring/dubbo-consumer.properties
@@ -19,3 +19,4 @@
dubbo.application.name=dubbo-demo-annotation-consumer
dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.protocol.port=-1
diff --git
a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/src/main/resources/spring/dubbo-provider.properties
b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/src/main/resources/spring/dubbo-provider.properties
index a40aee7..4b4913e 100644
---
a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/src/main/resources/spring/dubbo-provider.properties
+++
b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/src/main/resources/spring/dubbo-provider.properties
@@ -19,4 +19,4 @@
dubbo.application.name=dubbo-demo-annotation-provider
dubbo.protocol.name=dubbo
-dubbo.protocol.port=20880
+dubbo.protocol.port=-1
diff --git
a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
index 14649a3..785e53d 100644
---
a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
+++
b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
@@ -16,10 +16,12 @@
*/
package org.apache.dubbo.demo.consumer;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.MetadataReportConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
+import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.demo.DemoService;
import org.apache.dubbo.rpc.service.GenericService;
@@ -44,9 +46,10 @@ public class Application {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new ApplicationConfig("dubbo-demo-api-consumer"))
- .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
- .reference(reference)
- .start();
+ .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .protocol(new ProtocolConfig(CommonConstants.DUBBO, -1))
+ .reference(reference)
+ .start();
DemoService demoService = bootstrap.getCache().get(reference);
String message = demoService.sayHello("dubbo");
@@ -54,8 +57,8 @@ public class Application {
// generic invoke
GenericService genericService = (GenericService) demoService;
- Object genericInvokeResult = genericService.$invoke("sayHello", new
String[] { String.class.getName() },
- new Object[] { "dubbo generic invoke" });
+ Object genericInvokeResult = genericService.$invoke("sayHello", new
String[]{String.class.getName()},
+ new Object[]{"dubbo generic invoke"});
System.out.println(genericInvokeResult);
}
diff --git
a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
index f13bd3c..7712d6f 100644
---
a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
+++
b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
@@ -16,10 +16,12 @@
*/
package org.apache.dubbo.demo.provider;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.MetadataReportConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.ServiceConfig;
+import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.demo.DemoService;
@@ -46,6 +48,7 @@ public class Application {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new ApplicationConfig("dubbo-demo-api-provider"))
.registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .protocol(new ProtocolConfig(CommonConstants.DUBBO, -1))
.service(service)
.start()
.await();
diff --git
a/dubbo-demo/dubbo-demo-generic-call/src/main/java/org/apache/dubbo/demo/consumer/GenericApplication.java
b/dubbo-demo/dubbo-demo-generic-call/src/main/java/org/apache/dubbo/demo/consumer/GenericApplication.java
index 1c16ad8..610d2f1 100644
---
a/dubbo-demo/dubbo-demo-generic-call/src/main/java/org/apache/dubbo/demo/consumer/GenericApplication.java
+++
b/dubbo-demo/dubbo-demo-generic-call/src/main/java/org/apache/dubbo/demo/consumer/GenericApplication.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.MetadataReportConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
+import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.rpc.service.GenericService;
@@ -54,6 +55,7 @@ public class GenericApplication {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(applicationConfig)
.registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .protocol(new ProtocolConfig(CommonConstants.DUBBO, -1))
.reference(reference)
.start();
diff --git
a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/src/main/java/com/apache/dubbo/demo/graalvm/consumer/Application.java
b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/src/main/java/com/apache/dubbo/demo/graalvm/consumer/Application.java
index 5f81301..254842a 100644
---
a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/src/main/java/com/apache/dubbo/demo/graalvm/consumer/Application.java
+++
b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/src/main/java/com/apache/dubbo/demo/graalvm/consumer/Application.java
@@ -17,7 +17,9 @@
package com.apache.dubbo.demo.graalvm.consumer;
import org.apace.dubbo.graalvm.demo.DemoService;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
@@ -29,7 +31,7 @@ public class Application {
public static void main(String[] args) {
System.setProperty("dubbo.application.logger", "log4j");
- System.setProperty("native","true");
+ System.setProperty("native", "true");
if (isClassic(args)) {
runWithRefer();
} else {
@@ -47,17 +49,18 @@ public class Application {
reference.setGeneric("false");
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
- ApplicationConfig applicationConfig = new
ApplicationConfig("dubbo-demo-api-consumer");
+ ApplicationConfig applicationConfig = new
ApplicationConfig("dubbo-demo-api-consumer");
applicationConfig.setQosEnable(false);
applicationConfig.setCompiler("jdk");
- Map<String,String> m = new HashMap<>(1);
- m.put("proxy","jdk");
+ Map<String, String> m = new HashMap<>(1);
+ m.put("proxy", "jdk");
applicationConfig.setParameters(m);
bootstrap.application(applicationConfig)
- .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
- .reference(reference)
- .start();
+ .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .protocol(new ProtocolConfig(CommonConstants.DUBBO, -1))
+ .reference(reference)
+ .start();
DemoService demoService = bootstrap.getCache().get(reference);
String message = demoService.sayHello("Native");
diff --git
a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/src/main/java/org/apache/dubbo/demo/graalvm/provider/Application.java
b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/src/main/java/org/apache/dubbo/demo/graalvm/provider/Application.java
index b1b4615..60d21c9 100644
---
a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/src/main/java/org/apache/dubbo/demo/graalvm/provider/Application.java
+++
b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/src/main/java/org/apache/dubbo/demo/graalvm/provider/Application.java
@@ -16,7 +16,9 @@
*/
package org.apache.dubbo.demo.graalvm.provider;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.ServiceConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
@@ -54,15 +56,16 @@ public class Application {
ApplicationConfig applicationConfig = new
ApplicationConfig("dubbo-demo-api-provider");
applicationConfig.setQosEnable(false);
applicationConfig.setCompiler("jdk");
- Map<String,String> m = new HashMap<>(1);
- m.put("proxy","jdk");
+ Map<String, String> m = new HashMap<>(1);
+ m.put("proxy", "jdk");
applicationConfig.setParameters(m);
bootstrap.application(applicationConfig)
- .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
- .service(service)
- .start()
- .await();
+ .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .protocol(new ProtocolConfig(CommonConstants.DUBBO, -1))
+ .service(service)
+ .start()
+ .await();
}
private static void startWithExport() throws InterruptedException {
diff --git
a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiConsumer.java
b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiConsumer.java
index 53d15a9..61af87c 100644
---
a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiConsumer.java
+++
b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiConsumer.java
@@ -18,6 +18,7 @@ package org.apache.dubbo.demo.consumer;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
@@ -39,16 +40,17 @@ public class ApiConsumer {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new
ApplicationConfig("dubbo-demo-triple-api-consumer"))
- .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
- .reference(referenceConfig)
- .start();
+ .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .protocol(new ProtocolConfig(CommonConstants.TRIPLE, -1))
+ .reference(referenceConfig)
+ .start();
GreeterService greeterService = referenceConfig.get();
System.out.println("dubbo referenceConfig started");
try {
final HelloReply reply =
greeterService.sayHello(HelloRequest.newBuilder()
- .setName("triple")
- .build());
+ .setName("triple")
+ .build());
TimeUnit.SECONDS.sleep(1);
System.out.println("Reply: " + reply.getMessage());
} catch (Throwable t) {
diff --git
a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiWrapperConsumer.java
b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiWrapperConsumer.java
index d9d4daf..a67136b 100644
---
a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiWrapperConsumer.java
+++
b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiWrapperConsumer.java
@@ -16,7 +16,9 @@
*/
package org.apache.dubbo.demo.consumer;
+import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
@@ -34,9 +36,10 @@ public class ApiWrapperConsumer {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new
ApplicationConfig("dubbo-demo-triple-api-wrapper-consumer"))
- .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
- .reference(referenceConfig)
- .start();
+ .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .protocol(new ProtocolConfig(CommonConstants.TRIPLE, -1))
+ .reference(referenceConfig)
+ .start();
final GreeterWrapperService greeterWrapperService =
referenceConfig.get();
System.out.println("dubbo referenceConfig started");
diff --git
a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiProvider.java
b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiProvider.java
index 08750dd..fd422d7 100644
---
a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiProvider.java
+++
b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiProvider.java
@@ -33,10 +33,10 @@ public class ApiProvider {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new
ApplicationConfig("dubbo-demo-triple-api-provider"))
- .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
- .protocol(new ProtocolConfig(CommonConstants.TRIPLE, 50051))
- .service(serviceConfig)
- .start()
- .await();
+ .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .protocol(new ProtocolConfig(CommonConstants.TRIPLE, -1))
+ .service(serviceConfig)
+ .start()
+ .await();
}
}
diff --git
a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiWrapperProvider.java
b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiWrapperProvider.java
index 89e2da1..3a78d7d 100644
---
a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiWrapperProvider.java
+++
b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiWrapperProvider.java
@@ -35,10 +35,10 @@ public class ApiWrapperProvider {
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new
ApplicationConfig("dubbo-demo-triple-api-wrapper-provider"))
- .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
- .protocol(new ProtocolConfig(CommonConstants.TRIPLE, 50051))
- .service(serviceConfig)
- .start()
- .await();
+ .registry(new RegistryConfig("zookeeper://127.0.0.1:2181"))
+ .protocol(new ProtocolConfig(CommonConstants.TRIPLE, -1))
+ .service(serviceConfig)
+ .start()
+ .await();
}
}
diff --git
a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml
b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml
index be27b4c..a89803c 100644
---
a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml
+++
b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/spring/dubbo-consumer.xml
@@ -28,6 +28,10 @@
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:protocol name="dubbo" port="-1"/>
+ <dubbo:protocol name="rest" port="-1"/>
+ <dubbo:protocol name="tri" port="-1"/>
+
<dubbo:reference id="demoService" check="false"
interface="org.apache.dubbo.demo.DemoService"/>
