From e878c20ac7726bf71f99893564442c83122c1df1 Mon Sep 17 00:00:00 2001 From: Francesco Romani Date: Wed, 6 Oct 2021 17:41:45 +0200 Subject: [PATCH] e2e: node: improve error logging In the `restartKubelet` helper, we use `exec.Command`, whose return value is the output as the command, but as `[]byte`. The way we logged the output of the command was as value, making the output, meant to be human readable, unnecessarily hard to read. We fix this annoying behaviour converting the output to string before to log it out, making pretty obvious to understand the outcome of the command. Signed-off-by: Francesco Romani --- test/e2e_node/util.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index fde40d03c75..5a3599ee7fc 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -418,10 +418,10 @@ func restartKubelet() { kubeletServiceName := findKubletServiceName(false) // reset the kubelet service start-limit-hit stdout, err := exec.Command("sudo", "systemctl", "reset-failed", kubeletServiceName).CombinedOutput() - framework.ExpectNoError(err, "Failed to reset kubelet start-limit-hit with systemctl: %v, %v", err, stdout) + framework.ExpectNoError(err, "Failed to reset kubelet start-limit-hit with systemctl: %v, %s", err, string(stdout)) stdout, err = exec.Command("sudo", "systemctl", "restart", kubeletServiceName).CombinedOutput() - framework.ExpectNoError(err, "Failed to restart kubelet with systemctl: %v, %v", err, stdout) + framework.ExpectNoError(err, "Failed to restart kubelet with systemctl: %v, %s", err, string(stdout)) } // stopKubelet will kill the running kubelet, and returns a func that will restart the process again @@ -430,14 +430,14 @@ func stopKubelet() func() { // reset the kubelet service start-limit-hit stdout, err := exec.Command("sudo", "systemctl", "reset-failed", kubeletServiceName).CombinedOutput() - framework.ExpectNoError(err, "Failed to reset kubelet start-limit-hit with systemctl: %v, %v", err, stdout) + framework.ExpectNoError(err, "Failed to reset kubelet start-limit-hit with systemctl: %v, %s", err, string(stdout)) stdout, err = exec.Command("sudo", "systemctl", "kill", kubeletServiceName).CombinedOutput() - framework.ExpectNoError(err, "Failed to stop kubelet with systemctl: %v, %v", err, stdout) + framework.ExpectNoError(err, "Failed to stop kubelet with systemctl: %v, %s", err, string(stdout)) return func() { stdout, err := exec.Command("sudo", "systemctl", "start", kubeletServiceName).CombinedOutput() - framework.ExpectNoError(err, "Failed to restart kubelet with systemctl: %v, %v", err, stdout) + framework.ExpectNoError(err, "Failed to restart kubelet with systemctl: %v, %s", err, string(stdout)) } }