From c95924d4c0cf0d0b9a7537263a295cfc179dc30c Mon Sep 17 00:00:00 2001 From: harryteng9527 Date: Sat, 2 Nov 2024 16:08:52 +0800 Subject: [PATCH 1/5] Remove `startupRole` from the log --- .../hadoop/ozone/om/ratis/OzoneManagerStateMachine.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java index aa7211fa036a..dbf863576e2e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java @@ -28,6 +28,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; import org.apache.hadoop.hdds.utils.NettyMetrics; import org.apache.hadoop.hdds.utils.TransactionInfo; @@ -216,7 +217,9 @@ public void notifyConfigurationChanged(long term, long index, List newPeers = newRaftConfiguration.getPeersList(); LOG.info("Received Configuration change notification from Ratis. New Peer" + - " list:\n{}", newPeers); + " list:\n[{}]", newPeers.stream().map(peer -> + String.format("id: \"%s\"\naddress: \"%s\"", peer.getId().toStringUtf8(), peer.getAddress())) + .collect(Collectors.joining("\n,"))); List newPeerIds = new ArrayList<>(); for (RaftProtos.RaftPeerProto raftPeerProto : newPeers) { From 268e496be4416a0a564aa97cecc3b7be3cb71e38 Mon Sep 17 00:00:00 2001 From: harryteng9527 Date: Sat, 2 Nov 2024 16:35:35 +0800 Subject: [PATCH 2/5] Modify the format --- .../hadoop/ozone/om/ratis/OzoneManagerStateMachine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java index dbf863576e2e..dde0bc43ac1b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java @@ -217,9 +217,9 @@ public void notifyConfigurationChanged(long term, long index, List newPeers = newRaftConfiguration.getPeersList(); LOG.info("Received Configuration change notification from Ratis. New Peer" + - " list:\n[{}]", newPeers.stream().map(peer -> + " list:\n[{}\n]", newPeers.stream().map(peer -> String.format("id: \"%s\"\naddress: \"%s\"", peer.getId().toStringUtf8(), peer.getAddress())) - .collect(Collectors.joining("\n,"))); + .collect(Collectors.joining("\n, "))); List newPeerIds = new ArrayList<>(); for (RaftProtos.RaftPeerProto raftPeerProto : newPeers) { From 5353ff9d96420d42fdc351373095e84e5506c950 Mon Sep 17 00:00:00 2001 From: harryteng9527 Date: Sat, 2 Nov 2024 16:54:27 +0800 Subject: [PATCH 3/5] Change `\n` to `%n` --- .../apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java index dde0bc43ac1b..f878c8b42a52 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java @@ -218,7 +218,7 @@ public void notifyConfigurationChanged(long term, long index, newRaftConfiguration.getPeersList(); LOG.info("Received Configuration change notification from Ratis. New Peer" + " list:\n[{}\n]", newPeers.stream().map(peer -> - String.format("id: \"%s\"\naddress: \"%s\"", peer.getId().toStringUtf8(), peer.getAddress())) + String.format("id: \"%s\"%n address: \"%s\"", peer.getId().toStringUtf8(), peer.getAddress())) .collect(Collectors.joining("\n, "))); List newPeerIds = new ArrayList<>(); From d8fa2f221ffb2115c9aa926e99407f6c994c70e0 Mon Sep 17 00:00:00 2001 From: harryteng9527 Date: Tue, 5 Nov 2024 21:29:02 +0800 Subject: [PATCH 4/5] Remove newline format from newpeer log --- .../hadoop/ozone/om/ratis/OzoneManagerStateMachine.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java index f878c8b42a52..f971a7ad1cf2 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java @@ -216,10 +216,10 @@ public void notifyConfigurationChanged(long term, long index, RaftProtos.RaftConfigurationProto newRaftConfiguration) { List newPeers = newRaftConfiguration.getPeersList(); - LOG.info("Received Configuration change notification from Ratis. New Peer" + - " list:\n[{}\n]", newPeers.stream().map(peer -> - String.format("id: \"%s\"%n address: \"%s\"", peer.getId().toStringUtf8(), peer.getAddress())) - .collect(Collectors.joining("\n, "))); + List newPeersLogWithoutStartupRole = newPeers.stream() + .map(peer -> String.format("id: \"%s\" address: \"%s\"", peer.getId().toStringUtf8(), peer.getAddress())) + .collect(Collectors.toList()); + LOG.info("Received Configuration change notification from Ratis. New Peer list: {}", newPeersLogWithoutStartupRole); List newPeerIds = new ArrayList<>(); for (RaftProtos.RaftPeerProto raftPeerProto : newPeers) { From 0b8d8439dcfcb8ba3af03cdb297c348218523e4d Mon Sep 17 00:00:00 2001 From: harryteng9527 Date: Wed, 6 Nov 2024 08:11:01 +0800 Subject: [PATCH 5/5] Using `StringBuilder` to build log instead of creating a new list --- .../ozone/om/ratis/OzoneManagerStateMachine.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java index f971a7ad1cf2..6a5274ca01f5 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java @@ -28,7 +28,6 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; import org.apache.hadoop.hdds.utils.NettyMetrics; import org.apache.hadoop.hdds.utils.TransactionInfo; @@ -216,10 +215,15 @@ public void notifyConfigurationChanged(long term, long index, RaftProtos.RaftConfigurationProto newRaftConfiguration) { List newPeers = newRaftConfiguration.getPeersList(); - List newPeersLogWithoutStartupRole = newPeers.stream() - .map(peer -> String.format("id: \"%s\" address: \"%s\"", peer.getId().toStringUtf8(), peer.getAddress())) - .collect(Collectors.toList()); - LOG.info("Received Configuration change notification from Ratis. New Peer list: {}", newPeersLogWithoutStartupRole); + final StringBuilder logBuilder = new StringBuilder(1024) + .append("notifyConfigurationChanged from Ratis: term=").append(term) + .append(", index=").append(index) + .append(", New Peer list: "); + newPeers.forEach(peer -> logBuilder.append(peer.getId().toStringUtf8()) + .append("(") + .append(peer.getAddress()) + .append("), ")); + LOG.info(logBuilder.substring(0, logBuilder.length() - 2)); List newPeerIds = new ArrayList<>(); for (RaftProtos.RaftPeerProto raftPeerProto : newPeers) {