From 347fd813581d10fed9fde546b0b4c9a2a11f85c6 Mon Sep 17 00:00:00 2001
From: jianghuazhu <740087514@qq.com>
Date: Tue, 6 May 2025 14:48:15 +0800
Subject: [PATCH 1/2] RATIS-2287. Improve RaftServerImpl#toString() to make it
 more readable

---
 .../java/org/apache/ratis/server/impl/RaftServerImpl.java     | 2 +-
 .../main/java/org/apache/ratis/server/impl/ServerState.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
index a3652f4976..55ca635e86 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
@@ -727,7 +727,7 @@ synchronized void changeToCandidate(boolean forceStartLeaderElection) {
 
   @Override
   public String toString() {
-    return role + " " + state + " " + lifeCycle.getCurrentState();
+    return role + "-> " + state + "->" + lifeCycle.getCurrentState();
   }
 
   RaftClientReply.Builder newReplyBuilder(RaftClientRequest request) {
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
index c49e9554f0..b4c7672747 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
@@ -362,8 +362,8 @@ static int compareLog(TermIndex lastEntry, TermIndex candidateLastEntry) {
 
   @Override
   public String toString() {
-    return getMemberId() + ":t" + currentTerm + ", leader=" + getLeaderId()
-        + ", voted=" + votedFor + ", raftlog=" + log + ", conf=" + getRaftConf();
+    return "serverState(" + getMemberId() + ":t" + currentTerm + ", leader=" + getLeaderId()
+        + ", voted=" + votedFor + ", raftlog=" + log + ", conf=" + getRaftConf() + ")";
   }
 
   boolean isConfCommitted() {

From d4681aa492c4ef72be1b56b9ffe69fe9202131ff Mon Sep 17 00:00:00 2001
From: jianghuazhu <740087514@qq.com>
Date: Wed, 7 May 2025 11:11:42 +0800
Subject: [PATCH 2/2] Update some printing information.

---
 .../java/org/apache/ratis/server/impl/RaftServerImpl.java     | 2 +-
 .../main/java/org/apache/ratis/server/impl/ServerState.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
index 55ca635e86..7c016752ef 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
@@ -727,7 +727,7 @@ synchronized void changeToCandidate(boolean forceStartLeaderElection) {
 
   @Override
   public String toString() {
-    return role + "-> " + state + "->" + lifeCycle.getCurrentState();
+    return role + " (" + lifeCycle.getCurrentState() + "): " + state;
   }
 
   RaftClientReply.Builder newReplyBuilder(RaftClientRequest request) {
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
index b4c7672747..c49e9554f0 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
@@ -362,8 +362,8 @@ static int compareLog(TermIndex lastEntry, TermIndex candidateLastEntry) {
 
   @Override
   public String toString() {
-    return "serverState(" + getMemberId() + ":t" + currentTerm + ", leader=" + getLeaderId()
-        + ", voted=" + votedFor + ", raftlog=" + log + ", conf=" + getRaftConf() + ")";
+    return getMemberId() + ":t" + currentTerm + ", leader=" + getLeaderId()
+        + ", voted=" + votedFor + ", raftlog=" + log + ", conf=" + getRaftConf();
   }
 
   boolean isConfCommitted() {