Skip to content

HDDS-12496. Use TextFormat#shortDebugString to flatten proto message in SCMDatanodeProtocolServer. #8019

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 1 commit into from
Mar 7, 2025
Merged

HDDS-12496. Use TextFormat#shortDebugString to flatten proto message in SCMDatanodeProtocolServer. #8019

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions ...server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import com.google.common.collect.Maps;
import com.google.protobuf.BlockingService;
import com.google.protobuf.ProtocolMessageEnum;
import com.google.protobuf.TextFormat;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.ArrayList;
Expand Down Expand Up @@ -285,7 +286,7 @@ private String constructCommandAuditMap(List<SCMCommandProto> cmds) {
auditMap.append(" encodedToken: \"").append(cmd.getEncodedToken()).append("\"");
auditMap.append(" deadlineMsSinceEpoch: ").append(cmd.getDeadlineMsSinceEpoch());
} else {
auditMap.append(cmd);
auditMap.append(TextFormat.shortDebugString(cmd));
}
auditMap.append(", ");
}
Expand All @@ -308,7 +309,7 @@ public SCMHeartbeatResponseProto sendHeartbeat(
boolean auditSuccess = true;
Map<String, String> auditMap = Maps.newHashMap();
auditMap.put("datanodeUUID", heartbeat.getDatanodeDetails().getUuid());
auditMap.put("command", flatten(constructCommandAuditMap(cmdResponses)));
auditMap.put("command", constructCommandAuditMap(cmdResponses));
term.ifPresent(t -> auditMap.put("term", String.valueOf(t)));
try {
SCMHeartbeatResponseProto.Builder builder =
Expand Down Expand Up @@ -480,13 +481,6 @@ public AuditMessage buildAuditMessageForFailure(AuditAction op, Map<String,
.build();
}

private static String flatten(String input) {
return input
.replaceAll(System.lineSeparator(), " ")
.trim()
.replaceAll(" +", " ");
}

/**
* Get the ProtocolMessageMetrics for this server.
* @return ProtocolMessageMetrics
Expand Down