fix bug(alibaba#7971) ClusterVersionJudgement ClusterVersionJudge Tas…

…k never stop
ye213 · Mar 22, 2022 · e9cb1bc · e9cb1bc
1 parent f93813b
commit e9cb1bc
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/...rc/main/java/com/alibaba/nacos/naming/consistency/persistent/ClusterVersionJudgement.java b/...rc/main/java/com/alibaba/nacos/naming/consistency/persistent/ClusterVersionJudgement.java
@@ -70,15 +70,18 @@ protected void runVersionListener() {
             notifyAllListener();
             return;
         }
+        boolean finish = false;
         try {
-            judge();
+            finish = judge();
         } finally {
-            GlobalExecutor.submitClusterVersionJudge(this::runVersionListener, TimeUnit.SECONDS.toMillis(5));
+            if(!finish){
+                GlobalExecutor.submitClusterVersionJudge(this::runVersionListener, TimeUnit.SECONDS.toMillis(5));
+            }
         }
     }
 
-    protected void judge() {
-
+    protected boolean judge() {
+        boolean finish = false;
         Collection<Member> members = memberManager.allMembers();
         final String oldVersion = "1.4.0";
         boolean allMemberIsNewVersion = true;
@@ -91,7 +94,9 @@ protected void judge() {
         // can only trigger once
         if (allMemberIsNewVersion && !this.allMemberIsNewVersion) {
             notifyAllListener();
+            finish = true;
         }
+        return finish;
     }
 
     private void notifyAllListener() {