From 7943708b96d6c7273a4969742fd7f13fee9cebaf Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Thu, 28 Jan 2016 14:11:54 -0800 Subject: [PATCH] Log more information for ssh command. Sometimes e2e test nodes are refused to reboot, but we didn't properly catch the exit code. This one can give us more information on debugging. --- test/e2e/util.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/e2e/util.go b/test/e2e/util.go index d7fdbfd817a..471514a67c7 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -2179,9 +2179,10 @@ func issueSSHCommand(cmd, provider string, node *api.Node) error { if host == "" { return fmt.Errorf("couldn't find external IP address for node %s", node.Name) } - Logf("Calling %s on %s", cmd, node.Name) - if result, err := SSH(cmd, host, provider); result.Code != 0 || err != nil { - LogSSHResult(result) + Logf("Calling %s on %s(%s)", cmd, node.Name, host) + result, err := SSH(cmd, host, provider) + LogSSHResult(result) + if result.Code != 0 || err != nil { return fmt.Errorf("failed running %q: %v (exit code %d)", cmd, err, result.Code) } return nil