#502 Fix error log print

alibaba · Jan 17, 2019 · cc1f664 · cc1f664
1 parent 0e76f55
commit cc1f664
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/PeerSet.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/PeerSet.java
@@ -16,6 +16,7 @@
 package com.alibaba.nacos.naming.consistency.persistent.simpleraft;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.nacos.naming.boot.RunningConfig;
 import com.alibaba.nacos.naming.misc.HttpClient;
 import com.alibaba.nacos.naming.misc.Loggers;
 import com.alibaba.nacos.naming.misc.NetUtils;
@@ -43,6 +44,8 @@ public class PeerSet {
 
     private Set<String> sites = new HashSet<>();
 
+    private boolean ready = false;
+
     public PeerSet() {
     }
 
@@ -57,6 +60,10 @@ public Set<String> allSites() {
         return sites;
     }
 
+    public boolean isReady() {
+        return ready;
+    }
+
     public void add(List<String> servers) {
         for (String server : servers) {
             RaftPeer peer = new RaftPeer();
@@ -71,6 +78,10 @@ public void add(List<String> servers) {
             local.voteFor = NetUtils.localServer();
 
         }
+
+        if (RunningConfig.getServerPort() > 0) {
+            ready = true;
+        }
     }
 
     public void remove(List<String> servers) {

diff --git a/...ng/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftCore.java b/...ng/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftCore.java
@@ -371,6 +371,11 @@ public class MasterElection implements Runnable {
         @Override
         public void run() {
             try {
+
+                if (!peers.isReady()) {
+                    return;
+                }
+
                 RaftPeer local = peers.local();
                 local.leaderDueMs -= GlobalExecutor.TICK_PERIOD_MS;
                 if (local.leaderDueMs > 0) {
@@ -470,6 +475,10 @@ public class HeartBeat implements Runnable {
         @Override
         public void run() {
             try {
+                if (!peers.isReady()) {
+                    return;
+                }
+
                 RaftPeer local = peers.local();
                 local.heartbeatDueMs -= GlobalExecutor.TICK_PERIOD_MS;
                 if (local.heartbeatDueMs > 0) {