Merge branch 'fix-cdubbo-invoker-unavailable' into '2.7.7-ctrip'

Fix channel reconnect (apache#7322) See merge request framework/dubbo!50
vio-lin · Aug 4, 2021 · 4d4babe · 4d4babe
2 parents 487ff3f + bfdc892
commit 4d4babe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
@@ -163,7 +163,7 @@
         <mortbay_jetty_version>6.1.26</mortbay_jetty_version>
         <portlet_version>2.0</portlet_version>
         <maven_flatten_version>1.1.0</maven_flatten_version>
-        <revision>2.7.7-ctrip.8</revision>
+        <revision>2.7.7-ctrip.9</revision>
     </properties>
 
     <distributionManagement>

diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -32,7 +32,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>2.7.7-ctrip.8</revision>
+        <revision>2.7.7-ctrip.9</revision>
         <maven_flatten_version>1.1.0</maven_flatten_version>
     </properties>
     <distributionManagement>

diff --git a/...dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java b/...dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java
@@ -183,7 +183,7 @@ private void replaceWithLazyClient() {
         // this is a defensive operation to avoid client is closed by accident, the initial state of the client is false
         URL lazyUrl = URLBuilder.from(url)
                 .addParameter(LAZY_CONNECT_INITIAL_STATE_KEY, Boolean.TRUE)
-                .addParameter(RECONNECT_KEY, Boolean.FALSE)
+//                .addParameter(RECONNECT_KEY, Boolean.FALSE)
                 .addParameter(SEND_RECONNECT_KEY, Boolean.TRUE.toString())
                 .addParameter("warning", Boolean.TRUE.toString())
                 .addParameter(LazyConnectExchangeClient.REQUEST_WITH_WARNING_KEY, true)
@@ -209,5 +209,9 @@ public boolean isClosed() {
     public void incrementAndGetCount() {
         referenceCount.incrementAndGet();
     }
+
+    public int getCount(){
+        return referenceCount.get();
+    }
 }
 
diff --git a/pom.xml b/pom.xml
@@ -126,7 +126,7 @@
         <arguments />
         <checkstyle.skip>true</checkstyle.skip>
         <rat.skip>true</rat.skip>
-        <revision>2.7.7-ctrip.8</revision>
+        <revision>2.7.7-ctrip.9</revision>
     </properties>
     <distributionManagement>
         <snapshotRepository>