From 0ec85320cff34ab20f53e1ff08903f091270cc58 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 17 Feb 2020 12:07:10 +0100 Subject: [PATCH] podlogs: include node name in prefix This is useful for logs from daemonset pods because for those it is often relevant which node they ran on because they interact with resources or other pods on the host. To keep the log prefix short, it gets limited to a maximum length of 10 characters. --- test/e2e/framework/podlogs/podlogs.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/e2e/framework/podlogs/podlogs.go b/test/e2e/framework/podlogs/podlogs.go index 1485fd26158..4cc531ca544 100644 --- a/test/e2e/framework/podlogs/podlogs.go +++ b/test/e2e/framework/podlogs/podlogs.go @@ -133,7 +133,11 @@ func CopyAllLogs(ctx context.Context, cs clientset.Interface, ns string, to LogO var prefix string if to.LogWriter != nil { out = to.LogWriter - prefix = name + ": " + nodeName := pod.Spec.NodeName + if len(nodeName) > 10 { + nodeName = nodeName[0:4] + ".." + nodeName[len(nodeName)-4:] + } + prefix = name + "@" + nodeName + ": " } else { var err error filename := to.LogPathPrefix + pod.ObjectMeta.Name + "-" + c.Name + ".log"