Skip to content

K
k3s
Commit c71fd7b1 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #27031 from sttts/sttts-flake-26955-pod-logs

Automatic merge from submit-queue Flake 26955: portforwarding e2e: print logs when pod doesn't terminate For more insights why flake #26955 happens.
parents 38a1fb2b ff142b28
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 9 deletions
test/e2e/portforward.go
View file @ c71fd7b1
...@@ -180,9 +180,7 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -180,9 +180,7 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
conn.Close() conn.Close()
By("Waiting for the target pod to stop running") By("Waiting for the target pod to stop running")
if err := f.WaitForPodNoLongerRunning(pod.Name); err != nil { waitErr := f.WaitForPodNoLongerRunning(pod.Name)
framework.Failf("Pod did not stop running: %v", err)
}
By("Retrieving logs from the target pod") By("Retrieving logs from the target pod")
logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester") logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester")
...@@ -190,6 +188,11 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -190,6 +188,11 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
framework.Failf("Error retrieving logs: %v", err) framework.Failf("Error retrieving logs: %v", err)
} }
if waitErr != nil {
framework.Logf("Pod log:\n%s", logOutput)
framework.Failf("Pod did not stop running: %v", waitErr)
}
By("Verifying logs") By("Verifying logs")
verifyLogMessage(logOutput, "Accepted client connection") verifyLogMessage(logOutput, "Accepted client connection")
verifyLogMessage(logOutput, "Expected to read 3 bytes from client, but got 0 instead") verifyLogMessage(logOutput, "Expected to read 3 bytes from client, but got 0 instead")
...@@ -240,9 +243,7 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -240,9 +243,7 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
} }
By("Waiting for the target pod to stop running") By("Waiting for the target pod to stop running")
if err := f.WaitForPodNoLongerRunning(pod.Name); err != nil { waitErr := f.WaitForPodNoLongerRunning(pod.Name)
framework.Failf("Pod did not stop running: %v", err)
}
By("Retrieving logs from the target pod") By("Retrieving logs from the target pod")
logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester") logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester")
...@@ -250,6 +251,11 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -250,6 +251,11 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
framework.Failf("Error retrieving logs: %v", err) framework.Failf("Error retrieving logs: %v", err)
} }
if waitErr != nil {
framework.Logf("Pod log:\n%s", logOutput)
framework.Failf("Pod did not stop running: %v", waitErr)
}
By("Verifying logs") By("Verifying logs")
verifyLogMessage(logOutput, "^Accepted client connection$") verifyLogMessage(logOutput, "^Accepted client connection$")
verifyLogMessage(logOutput, "^Received expected client data$") verifyLogMessage(logOutput, "^Received expected client data$")
...@@ -292,9 +298,7 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -292,9 +298,7 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
} }
By("Waiting for the target pod to stop running") By("Waiting for the target pod to stop running")
if err := f.WaitForPodNoLongerRunning(pod.Name); err != nil { waitErr := f.WaitForPodNoLongerRunning(pod.Name)
framework.Failf("Pod did not stop running: %v", err)
}
By("Retrieving logs from the target pod") By("Retrieving logs from the target pod")
logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester") logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester")
...@@ -302,6 +306,11 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -302,6 +306,11 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
framework.Failf("Error retrieving logs: %v", err) framework.Failf("Error retrieving logs: %v", err)
} }
if waitErr != nil {
framework.Logf("Pod log:\n%s", logOutput)
framework.Failf("Pod did not stop running: %v", waitErr)
}
By("Verifying logs") By("Verifying logs")
verifyLogMessage(logOutput, "Accepted client connection") verifyLogMessage(logOutput, "Accepted client connection")
verifyLogMessage(logOutput, "Done") verifyLogMessage(logOutput, "Done")
......
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