Skip to content

Commit a428b15

Browse files
HDDS-12496. Use TextFormat#shortDebugString to flatten proto message in SCMDatanodeProtocolServer. (apache#8019)
1 parent ecd2de0 commit a428b15

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import com.google.common.collect.Maps;
4545
import com.google.protobuf.BlockingService;
4646
import com.google.protobuf.ProtocolMessageEnum;
47+
import com.google.protobuf.TextFormat;
4748
import java.io.IOException;
4849
import java.net.InetSocketAddress;
4950
import java.util.ArrayList;
@@ -285,7 +286,7 @@ private String constructCommandAuditMap(List<SCMCommandProto> cmds) {
285286
auditMap.append(" encodedToken: \"").append(cmd.getEncodedToken()).append("\"");
286287
auditMap.append(" deadlineMsSinceEpoch: ").append(cmd.getDeadlineMsSinceEpoch());
287288
} else {
288-
auditMap.append(cmd);
289+
auditMap.append(TextFormat.shortDebugString(cmd));
289290
}
290291
auditMap.append(", ");
291292
}
@@ -308,7 +309,7 @@ public SCMHeartbeatResponseProto sendHeartbeat(
308309
boolean auditSuccess = true;
309310
Map<String, String> auditMap = Maps.newHashMap();
310311
auditMap.put("datanodeUUID", heartbeat.getDatanodeDetails().getUuid());
311-
auditMap.put("command", flatten(constructCommandAuditMap(cmdResponses)));
312+
auditMap.put("command", constructCommandAuditMap(cmdResponses));
312313
term.ifPresent(t -> auditMap.put("term", String.valueOf(t)));
313314
try {
314315
SCMHeartbeatResponseProto.Builder builder =
@@ -480,13 +481,6 @@ public AuditMessage buildAuditMessageForFailure(AuditAction op, Map<String,
480481
.build();
481482
}
482483

483-
private static String flatten(String input) {
484-
return input
485-
.replaceAll(System.lineSeparator(), " ")
486-
.trim()
487-
.replaceAll(" +", " ");
488-
}
489-
490484
/**
491485
* Get the ProtocolMessageMetrics for this server.
492486
* @return ProtocolMessageMetrics

0 commit comments

Comments
 (0)