Fix the bug that restarting server leads to the client unavailable. (#…

…665)
sofastack · Jun 13, 2019 · 097a9e4 · 097a9e4
1 parent 3e5381a
commit 097a9e4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/core-impl/client/src/main/java/com/alipay/sofa/rpc/client/AllConnectConnectionHolder.java b/core-impl/client/src/main/java/com/alipay/sofa/rpc/client/AllConnectConnectionHolder.java
@@ -631,6 +631,7 @@ protected Map<ProviderInfo, ClientTransport> clearProviders() {
             aliveConnections.clear();
             retryConnections.clear();
             uninitializedConnections.clear();
+            lastAddresses.clear();
             return all;
         } finally {
             providerLock.unlock();

diff --git a/...gration/src/test/java/com/alipay/sofa/rpc/test/client/AllConnectConnectionHolderTest.java b/...gration/src/test/java/com/alipay/sofa/rpc/test/client/AllConnectConnectionHolderTest.java
@@ -161,4 +161,36 @@ public void getAvailableClientTransport3() throws Exception {
 
         consumerConfig.unRefer();
     }
+
+    @Test
+    public void getAvailableClientTransport4() throws Exception {
+        ConsumerConfig<HelloService> consumerConfig = new ConsumerConfig<HelloService>()
+            .setInterfaceId(HelloService.class.getName())
+            .setDirectUrl("bolt://127.0.0.1:22223,bolt://127.0.0.1:22224")
+            .setConnectionHolder("all")
+            .setRegister(false)
+            .setLazy(true)
+            .setTimeout(3000);
+        HelloService helloService = consumerConfig.refer();
+        ClientProxyInvoker invoker = (ClientProxyInvoker) ProxyFactory.getInvoker(helloService,
+            consumerConfig.getProxy());
+        Cluster cluster = invoker.getCluster();
+        Assert.assertTrue(cluster.getConnectionHolder() instanceof AllConnectConnectionHolder);
+        AllConnectConnectionHolder holder = (AllConnectConnectionHolder) cluster.getConnectionHolder();
+
+        ProviderGroup providerGroups = new ProviderGroup();
+        providerGroups.add(ProviderHelper.toProviderInfo("bolt://127.0.0.1:22223"));
+        providerGroups.add(ProviderHelper.toProviderInfo("bolt://127.0.0.1:22224"));
+        holder.updateProviders(providerGroups);
+        Set<ProviderInfo> last = holder.currentProviderList();
+        Assert.assertEquals(2, last.size());
+
+        ProviderGroup providerGroups2 = new ProviderGroup();
+        holder.updateProviders(providerGroups2);
+        Set<ProviderInfo> current = holder.currentProviderList();
+
+        Assert.assertEquals(0, current.size());
+
+        consumerConfig.unRefer();
+    }
 }