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 712d0b2 fix address in used error of port 2181 (#8466)
712d0b2 is described below
commit 712d0b22f3d0830f5a77b6ad06b99612f9b98e68
Author: Gong Dewei <[email protected]>
AuthorDate: Sun Aug 15 17:43:13 2021 +0800
fix address in used error of port 2181 (#8466)
---
.../injvm/MultipleRegistryCenterInjvmIntegrationTest.java | 2 +-
.../SingleRegistryCenterDubboProtocolIntegrationTest.java | 3 ++-
.../injvm/SingleRegistryCenterInjvmIntegrationTest.java | 3 ++-
.../dubbo/registrycenter/DefaultMultipleRegistryCenter.java | 12 +++++++++++-
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/multiple/injvm/MultipleRegistryCenterInjvmIntegrationTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/multiple/injvm/MultipleRegistryCenterInjvmIntegrationTest.java
index e0ac0bc..e4d5003 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/multiple/injvm/MultipleRegistryCenterInjvmIntegrationTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/multiple/injvm/MultipleRegistryCenterInjvmIntegrationTest.java
@@ -87,7 +87,7 @@ public class MultipleRegistryCenterInjvmIntegrationTest
implements IntegrationTe
logger.info(getClass().getSimpleName() + " testcase is beginning...");
DubboBootstrap.reset();
//start all zookeeper services only once
- registryCenter = new DefaultMultipleRegistryCenter();
+ registryCenter = new DefaultMultipleRegistryCenter(-1);
registryCenter.startup();
// initialize service config
serviceConfig = new ServiceConfig<>();
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/single/SingleRegistryCenterDubboProtocolIntegrationTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/single/SingleRegistryCenterDubboProtocolIntegrationTest.java
index 474c88b..f428ef4 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/single/SingleRegistryCenterDubboProtocolIntegrationTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/single/SingleRegistryCenterDubboProtocolIntegrationTest.java
@@ -19,6 +19,7 @@ package org.apache.dubbo.integration.single;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.extension.ExtensionLoader;
+import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.ServiceConfig;
import org.apache.dubbo.config.ReferenceConfig;
@@ -109,7 +110,7 @@ public class
SingleRegistryCenterDubboProtocolIntegrationTest implements Integra
public void setUp() throws Exception {
logger.info(getClass().getSimpleName() + " testcase is beginning...");
DubboBootstrap.reset();
- registryCenter = new DefaultSingleRegistryCenter();
+ registryCenter = new
DefaultSingleRegistryCenter(NetUtils.getAvailablePort());
registryCenter.startup();
// initialize ServiceConfig
serviceConfig = new ServiceConfig<>();
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/single/injvm/SingleRegistryCenterInjvmIntegrationTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/single/injvm/SingleRegistryCenterInjvmIntegrationTest.java
index 50e6c3f..1ee0680 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/single/injvm/SingleRegistryCenterInjvmIntegrationTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/integration/single/injvm/SingleRegistryCenterInjvmIntegrationTest.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.integration.single.injvm;
import org.apache.dubbo.common.extension.ExtensionLoader;
+import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.config.ServiceConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.ServiceListener;
@@ -84,7 +85,7 @@ public class SingleRegistryCenterInjvmIntegrationTest
implements IntegrationTest
public void setUp() throws Exception {
logger.info(getClass().getSimpleName() + " testcase is beginning...");
DubboBootstrap.reset();
- registryCenter = new DefaultSingleRegistryCenter();
+ registryCenter = new
DefaultSingleRegistryCenter(NetUtils.getAvailablePort());
registryCenter.startup();
// initialize service config
serviceConfig = new ServiceConfig<>();
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/registrycenter/DefaultMultipleRegistryCenter.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/registrycenter/DefaultMultipleRegistryCenter.java
index ba7f3ea..1659b9a 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/registrycenter/DefaultMultipleRegistryCenter.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/registrycenter/DefaultMultipleRegistryCenter.java
@@ -48,6 +48,16 @@ public class DefaultMultipleRegistryCenter implements
MultipleRegistryCenter {
*/
private static final int DEFAULT_PORT = 2181;
+ private final int port;
+
+ public DefaultMultipleRegistryCenter() {
+ this(DEFAULT_PORT);
+ }
+
+ public DefaultMultipleRegistryCenter(int port) {
+ this.port = port;
+ }
+
/**
* {@inheritDoc}
*/
@@ -55,7 +65,7 @@ public class DefaultMultipleRegistryCenter implements
MultipleRegistryCenter {
public void startup() throws RpcException {
try {
logger.info("The DefaultMultipleRegistryCenter is starting...");
- this.zookeeperServer1 = new TestingServer(DEFAULT_PORT);
+ this.zookeeperServer1 = new TestingServer(port);
this.zookeeperServer2 = new TestingServer();
logger.info("The DefaultMultipleRegistryCenter is started
successfully");
} catch (Exception exception) {
