From c8da7fc10abf15ab48b155cf8b8f9a77208b3398 Mon Sep 17 00:00:00 2001 From: horizonzy <1060026287@qq.com> Date: Fri, 12 Jun 2020 16:10:21 +0800 Subject: [PATCH 1/2] don't send beat when standalone model --- .../nacos/naming/consistency/persistent/raft/RaftCore.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java index 8f550fb73f7..6b6a3fa57b7 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java @@ -484,10 +484,9 @@ public void run() { public void sendBeat() throws IOException, InterruptedException { RaftPeer local = peers.local(); - if (local.state != RaftPeer.State.LEADER && !ApplicationUtils.getStandaloneMode()) { + if (ApplicationUtils.getStandaloneMode() || local.state != RaftPeer.State.LEADER){ return; } - if (Loggers.RAFT.isDebugEnabled()) { Loggers.RAFT.debug("[RAFT] send beat with {} keys.", datums.size()); } From cd3fd9afaee878d7d8835075bb4a83b791aed18b Mon Sep 17 00:00:00 2001 From: horizonzy <1060026287@qq.com> Date: Tue, 16 Jun 2020 09:35:01 +0800 Subject: [PATCH 2/2] format the code. --- .../nacos/naming/consistency/persistent/raft/RaftCore.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java index 6b6a3fa57b7..f8e05256566 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java @@ -484,7 +484,7 @@ public void run() { public void sendBeat() throws IOException, InterruptedException { RaftPeer local = peers.local(); - if (ApplicationUtils.getStandaloneMode() || local.state != RaftPeer.State.LEADER){ + if (ApplicationUtils.getStandaloneMode() || local.state != RaftPeer.State.LEADER) { return; } if (Loggers.RAFT.isDebugEnabled()) { @@ -682,7 +682,8 @@ public Integer onCompleted(Response response) throws Exception { return 1; } - List datumList = JacksonUtils.toObj(response.getResponseBody(), new TypeReference>() {}); + List datumList = JacksonUtils.toObj(response.getResponseBody(), new TypeReference>() { + }); for (JsonNode datumJson : datumList) { OPERATE_LOCK.lock();