Fix the provider config repeated export limit. (#151)

sofastack · May 30, 2018 · 43f1430 · 43f1430
1 parent 1505813
commit 43f1430
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/...xtension-common/src/main/java/com/alipay/sofa/rpc/bootstrap/DefaultProviderBootstrap.java b/...xtension-common/src/main/java/com/alipay/sofa/rpc/bootstrap/DefaultProviderBootstrap.java
@@ -68,23 +68,24 @@ protected DefaultProviderBootstrap(ProviderConfig<T> providerConfig) {
     /**
      * 是否已发布
      */
-    protected transient volatile boolean                     exported;
+    protected transient volatile boolean                            exported;
 
     /**
      * 服务端Invoker对象
      */
-    protected transient Invoker                              providerProxyInvoker;
+    protected transient Invoker                                     providerProxyInvoker;
 
     /**
      * 发布的服务配置
      */
-    protected final ConcurrentHashMap<String, AtomicInteger> EXPORTED_KEYS = new ConcurrentHashMap<String, AtomicInteger>();
+    protected final static ConcurrentHashMap<String, AtomicInteger> EXPORTED_KEYS = new ConcurrentHashMap<String, AtomicInteger>();
 
     /**
      * 延迟加载的线程名工厂
      */
-    private final ThreadFactory                              factory       = new NamedThreadFactory("DELAY-EXPORT",
-                                                                               true);
+    private final ThreadFactory                                     factory       = new NamedThreadFactory(
+                                                                                      "DELAY-EXPORT",
+                                                                                      true);
 
     @Override
     public void export() {

diff --git a/.../rpc/bootstrap/dubbo/DubooServerTest.java → .../rpc/bootstrap/dubbo/DubboServerTest.java b/.../rpc/bootstrap/dubbo/DubooServerTest.java → .../rpc/bootstrap/dubbo/DubboServerTest.java
@@ -29,9 +29,8 @@
 
 /**
  * @author bystander
- * @version $Id: DubooServerTest.java, v 0.1 2017年10月30日 下午9:23 bystander Exp $
  */
-public class DubooServerTest extends BaseZkTest {
+public class DubboServerTest extends BaseZkTest {
 
     @Test
     //同步调用,走配置中心

diff --git a/test/test-integration-3rd/src/test/java/com/alipay/sofa/rpc/registry/zk/WarmUpTest.java b/test/test-integration-3rd/src/test/java/com/alipay/sofa/rpc/registry/zk/WarmUpTest.java
@@ -23,7 +23,6 @@
 import com.alipay.sofa.rpc.config.ProviderConfig;
 import com.alipay.sofa.rpc.config.RegistryConfig;
 import com.alipay.sofa.rpc.config.ServerConfig;
-import com.alipay.sofa.rpc.test.ActivelyDestroyTest;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -60,6 +59,7 @@ public void testWarmUp() throws InterruptedException {
             .setRef(new WarmUpServiceImpl(22111))
             .setServer(serverConfig2)
             .setRegistry(registryConfig)
+            .setRepeatedExportLimit(-1)
             .setWeight(0);
 
         providerConfig.export();

diff --git a/...tion/src/test/java/com/alipay/sofa/rpc/test/bootstrap/bolt/BoltConsumerBootstrapTest.java b/...tion/src/test/java/com/alipay/sofa/rpc/test/bootstrap/bolt/BoltConsumerBootstrapTest.java
@@ -67,6 +67,7 @@ public void refer() throws Exception {
             .setTimeout(3000);
         try {
             consumerConfig3.refer();
+            Assert.fail();
         } catch (Exception e) {
             Assert.assertTrue(e instanceof SofaRpcRuntimeException);
         }
@@ -85,6 +86,7 @@ public void refer() throws Exception {
             .setTimeout(3000);
         try {
             consumerConfig5.refer();
+            Assert.fail();
         } catch (Exception e) {
             Assert.assertTrue(e instanceof SofaRpcRuntimeException);
         }

diff --git a/...tion/src/test/java/com/alipay/sofa/rpc/test/bootstrap/bolt/BoltProviderBootstrapTest.java b/...tion/src/test/java/com/alipay/sofa/rpc/test/bootstrap/bolt/BoltProviderBootstrapTest.java
@@ -63,6 +63,7 @@ public void export() throws Exception {
             .setRegister(false);
         try {
             providerConfig1.export();
+            Assert.fail();
         } catch (Exception e) {
             Assert.assertTrue(e instanceof SofaRpcRuntimeException);
         }
@@ -72,7 +73,7 @@ public void export() throws Exception {
             .setInterfaceId(HelloService.class.getName())
             .setRef(new HelloServiceImpl(2000))
             .setServer(serverConfig)
-            .setRepeatedExportLimit(3)
+            .setRepeatedExportLimit(2)
             .setRegister(false);
         providerConfig2.export();
 
@@ -81,10 +82,11 @@ public void export() throws Exception {
             .setInterfaceId(HelloService.class.getName())
             .setRef(new HelloServiceImpl(2000))
             .setServer(serverConfig)
-            .setRepeatedExportLimit(3)
+            .setRepeatedExportLimit(2)
             .setRegister(false);
         try {
             providerConfig3.export();
+            Assert.fail();
         } catch (Exception e) {
             Assert.assertTrue(e instanceof SofaRpcRuntimeException);
         }