Skip to content

HDDS-11623. Improve OM Ratis Configuration change log message #7388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 7 commits into from
Nov 6, 2024
Merged

HDDS-11623. Improve OM Ratis Configuration change log message #7388

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c95924d
Remove `startupRole` from the log
harryteng9527 Nov 2, 2024
268e496
Modify the format
harryteng9527 Nov 2, 2024
5353ff9
Change `\n` to `%n`
harryteng9527 Nov 2, 2024
59cf682
Merge branch 'master' of github.com:apache/ozone into HDDS-11623-chan…
harryteng9527 Nov 5, 2024
d8fa2f2
Remove newline format from newpeer log
harryteng9527 Nov 5, 2024
4e762bc
Merge branch 'master' of github.com:harryteng9527/ozone into HDDS-116…
harryteng9527 Nov 6, 2024
0b8d843
Using `StringBuilder` to build log instead of creating a new list
harryteng9527 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...zone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -215,8 +216,10 @@ public void notifyConfigurationChanged(long term, long index,
RaftProtos.RaftConfigurationProto newRaftConfiguration) {
List<RaftProtos.RaftPeerProto> newPeers =
newRaftConfiguration.getPeersList();
LOG.info("Received Configuration change notification from Ratis. New Peer" +
" list:\n{}", newPeers);
List<String> 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);

@szetszwo szetszwo Nov 5, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Let's use StringBuilder instead of creating a new List.
  • Print also term and index.
    final StringBuilder b = new StringBuilder(1024)
        .append("notifyConfigurationChanged from Ratis: term=").append(term)
        .append(", index=").append(index)
        .append(", New Peer list: ");
   newPeers.forEach(peer -> b.append(peer.getId()).append("(").append(peer.getAddress()).append("), "));
   LOG.info(b.substring(0, b.length() - 2));

@harryteng9527 harryteng9527 Nov 6, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reviewing!

After the modification, the current log will be like：

notifyConfigurationChanged from Ratis: term=1, index=0, New Peer list: omNode-3(localhost:15015), omNode-1(localhost:15007), omNode-2(localhost:15011)


List<String> newPeerIds = new ArrayList<>();
for (RaftProtos.RaftPeerProto raftPeerProto : newPeers) {
Expand Down