Skip to content

K
k3s
Commit a4fc58cc authored by Patrick Ohly's avatar Patrick Ohly
Browse files
Options

e2e/framework: capture logs only from pods that actually started

Attempting to retrieve logs for a container that hasn't started yet may have been the reason for the "the server does not allow this method on the requested resource" error that showed up on the GCE CI test cluster (issue #70888). If we wait with retrieving logs until the pod is running or has terminated, then we might be able to avoid that error. It's the right thing to do either way and not complicated to implement.
parent 7ba79c31
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
test/e2e/framework/podlogs/podlogs.go
View file @ a4fc58cc
...@@ -99,9 +99,15 @@ func CopyAllLogs(ctx context.Context, cs clientset.Interface, ns string, to LogO ...@@ -99,9 +99,15 @@ func CopyAllLogs(ctx context.Context, cs clientset.Interface, ns string, to LogO
} }
for _, pod := range pods.Items { for _, pod := range pods.Items {
for _, c := range pod.Spec.Containers { for i, c := range pod.Spec.Containers {
name := pod.ObjectMeta.Name + "/" + c.Name name := pod.ObjectMeta.Name + "/" + c.Name
if logging[name] { if logging[name] ||
// sanity check, array should have entry for each container
len(pod.Status.ContainerStatuses) <= i ||
// Don't attempt to get logs for a container unless it is running or has terminated.
// Trying to get a log would just end up with an error that we would have to suppress.
(pod.Status.ContainerStatuses[i].State.Running == nil &&
pod.Status.ContainerStatuses[i].State.Terminated == nil) {
continue continue
} }
readCloser, err := LogsForPod(ctx, cs, ns, pod.ObjectMeta.Name, readCloser, err := LogsForPod(ctx, cs, ns, pod.ObjectMeta.Name,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment