You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ca...@apache.org on 2018/11/07 08:55:35 UTC
[incubator-dubbo] branch 2.6.x updated: Add forks support for
ForkingCluster. (#2751)
This is an automated email from the ASF dual-hosted git repository.
carryxyh pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new ef4ecdf Add forks support for ForkingCluster. (#2751)
ef4ecdf is described below
commit ef4ecdf3a36f1378895e611c44c330aba1284fd0
Author: 时无两丶 <44...@qq.com>
AuthorDate: Wed Nov 7 16:55:11 2018 +0800
Add forks support for ForkingCluster. (#2751)
Add forks support for ForkingCluster.
---
.../java/com/alibaba/dubbo/config/AbstractMethodConfig.java | 13 +++++++++++++
.../com/alibaba/dubbo/config/AbstractMethodConfigTest.java | 7 +++++++
.../src/main/resources/META-INF/compat/dubbo.xsd | 10 ++++++++++
.../src/main/resources/META-INF/dubbo.xsd | 10 ++++++++++
.../java/com/alibaba/dubbo/config/spring/ConfigTest.java | 13 +++++++++++++
5 files changed, 53 insertions(+)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractMethodConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractMethodConfig.java
index 92df4a1..aa8b7ea 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractMethodConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractMethodConfig.java
@@ -64,6 +64,19 @@ public abstract class AbstractMethodConfig extends AbstractConfig {
// customized parameters
protected Map<String, String> parameters;
+ /**
+ * forks for forking cluster
+ */
+ protected Integer forks;
+
+ public Integer getForks() {
+ return forks;
+ }
+
+ public void setForks(Integer forks) {
+ this.forks = forks;
+ }
+
public Integer getTimeout() {
return timeout;
}
diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractMethodConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractMethodConfigTest.java
index 2a1a890..d5463fe 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractMethodConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractMethodConfigTest.java
@@ -36,6 +36,13 @@ public class AbstractMethodConfigTest {
}
@Test
+ public void testForks() throws Exception {
+ MethodConfig methodConfig = new MethodConfig();
+ methodConfig.setForks(10);
+ assertThat(methodConfig.getForks(), equalTo(10));
+ }
+
+ @Test
public void testRetries() throws Exception {
MethodConfig methodConfig = new MethodConfig();
methodConfig.setRetries(3);
diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd
index 2dbdde1..c48e2c3 100644
--- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd
+++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd
@@ -101,6 +101,11 @@
<xsd:documentation><![CDATA[ Use cluster strategy. ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="forks" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[ ForkingCluster forks. ]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="filter" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[ The filter. ]]></xsd:documentation>
@@ -480,6 +485,11 @@
<xsd:documentation><![CDATA[ The registry cluster type. ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="forks" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[ ForkingCluster forks. ]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="group" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[ The registry group. ]]></xsd:documentation>
diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
index 0c17e24..40a7ac6 100644
--- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
+++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
@@ -101,6 +101,11 @@
<xsd:documentation><![CDATA[ Use cluster strategy. ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="forks" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[ ForkingCluster forks. ]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="filter" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[ The filter. ]]></xsd:documentation>
@@ -480,6 +485,11 @@
<xsd:documentation><![CDATA[ The registry cluster type. ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="forks" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[ ForkingCluster forks. ]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="group" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[ The registry group. ]]></xsd:documentation>
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
index 2415de4..69f716b 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
@@ -149,6 +149,19 @@ public class ConfigTest {
}
@Test
+ public void testForks() {
+ ReferenceConfig<DemoService> reference = new ReferenceConfig<DemoService>();
+ reference.setApplication(new ApplicationConfig("consumer"));
+ reference.setRegistry(new RegistryConfig(RegistryConfig.NO_AVAILABLE));
+ reference.setInterface(DemoService.class);
+ reference.setUrl("dubbo://127.0.0.1:20881");
+ int forks = 10;
+ reference.setForks(forks);
+ String str = reference.toString();
+ assertTrue(str.contains("forks=\"" + forks + "\""));
+ }
+
+ @Test
public void testMultiProtocol() {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.', '/') + "/multi-protocol.xml");
ctx.start();