From 34a828d07e0886a4b2beb320dfd57c0a611f32db Mon Sep 17 00:00:00 2001
From: Vishnu kannan <vishnuk@google.com>
Date: Wed, 25 May 2016 15:04:02 -0700
Subject: [PATCH 1/2] Link kernel log files to have them be copied over as part
 of node e2e.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
---
 test/e2e_node/e2e_node_suite_test.go | 11 +++--
 test/e2e_node/e2e_remote.go          |  1 +
 test/e2e_node/e2e_service.go         | 65 ++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/test/e2e_node/e2e_node_suite_test.go b/test/e2e_node/e2e_node_suite_test.go
index b450db81318..769c6d0c1e6 100644
--- a/test/e2e_node/e2e_node_suite_test.go
+++ b/test/e2e_node/e2e_node_suite_test.go
@@ -101,9 +101,12 @@ var _ = BeforeSuite(func() {
 
 // Tear down the kubelet on the node
 var _ = AfterSuite(func() {
-	if e2es != nil && *startServices && *stopServices {
-		glog.Infof("Stopping node services...")
-		e2es.stop()
+	if e2es != nil {
+		e2es.getLogFiles()
+		if *startServices && *stopServices {
+			glog.Infof("Stopping node services...")
+			e2es.stop()
+		}
 	}
 	glog.Infof("Tests Finished")
 })
@@ -117,6 +120,6 @@ func maskLocksmithdOnCoreos() {
 		if output, err := exec.Command("sudo", "systemctl", "mask", "--now", "locksmithd").CombinedOutput(); err != nil {
 			glog.Fatalf("Could not mask locksmithd: %v, output: %q", err, string(output))
 		}
+		glog.Infof("Locksmithd is masked successfully")
 	}
-	glog.Infof("Locksmithd is masked successfully")
 }
diff --git a/test/e2e_node/e2e_remote.go b/test/e2e_node/e2e_remote.go
index 20f4280664b..8abb467ceb6 100644
--- a/test/e2e_node/e2e_remote.go
+++ b/test/e2e_node/e2e_remote.go
@@ -188,6 +188,7 @@ func RunRemote(archive string, host string, cleanup bool, junitFileNumber int) (
 	glog.Infof("Copying test artifacts from %s", host)
 	scpErr := getTestArtifacts(host, tmp)
 	exitOk := true
+	glog.Errorf("vishh: %v", scpErr)
 	if scpErr != nil {
 		// Only exit non-0 if the scp failed
 		exitOk = false
diff --git a/test/e2e_node/e2e_service.go b/test/e2e_node/e2e_service.go
index 8b8f629730a..1199e911732 100644
--- a/test/e2e_node/e2e_service.go
+++ b/test/e2e_node/e2e_service.go
@@ -75,6 +75,71 @@ func (es *e2eService) start() error {
 	return nil
 }
 
+// Get logs of interest either via journalctl or by creating sym links.
+// Since we scp files from the remote directory, symlinks will be treated as normal files and file contents will be copied over.
+func (es *e2eService) getLogFiles() {
+	// Special log files that need to be collected for additional debugging.
+	type logFileData struct {
+		files             []string
+		journalctlCommand []string
+	}
+	var logFiles = map[string]logFileData{
+		"kern.log":   {[]string{"/var/log/kern.log"}, []string{"-k"}},
+		"docker.log": {[]string{"/var/log/docker.log", "/var/log/upstart/docker.log"}, []string{"-u", "docker"}},
+	}
+
+	// Nothing to do if report dir is not specified.
+	if *reportDir == "" {
+		return
+	}
+	journaldFound := isJournaldAvailable()
+	for targetFileName, logFileData := range logFiles {
+		targetLink := path.Join(*reportDir, targetFileName)
+		if journaldFound {
+			// Skip log files that do not have an equivalent in journald based machines.
+			if len(logFileData.journalctlCommand) == 0 {
+				continue
+			}
+			out, err := exec.Command("sudo", append([]string{"journalctl"}, logFileData.journalctlCommand...)...).CombinedOutput()
+			if err != nil {
+				glog.Errorf("failed to get %q from journald: %v, %v", targetFileName, string(out), err)
+			} else {
+				if err = ioutil.WriteFile(targetLink, out, 0755); err != nil {
+					glog.Errorf("failed to write logs to %q: %v", targetLink, err)
+				}
+			}
+			continue
+		}
+		for _, file := range logFileData.files {
+			if _, err := os.Stat(file); err != nil {
+				// Expected file not found on this distro.
+				continue
+			}
+			if err := copyLogFile(file, targetLink); err != nil {
+				glog.Error(err)
+			} else {
+				break
+			}
+		}
+	}
+}
+
+func copyLogFile(src, target string) error {
+	// If not a journald based distro, then just symlink files.
+	if out, err := exec.Command("sudo", "cp", src, target).CombinedOutput(); err != nil {
+		return fmt.Errorf("failed to copy %q to %q: %v, %v", src, target, out, err)
+	}
+	if out, err := exec.Command("sudo", "chmod", "a+r", target).CombinedOutput(); err != nil {
+		return fmt.Errorf("failed to make log file %q world readable: %v, %v", target, out, err)
+	}
+	return nil
+}
+
+func isJournaldAvailable() bool {
+	_, err := exec.LookPath("journalctl")
+	return err == nil
+}
+
 func (es *e2eService) stop() {
 	if es.kubeletCmd != nil {
 		err := es.kubeletCmd.Process.Kill()

From 4e1596e61eaa0770f48a2ee9a04054531db4ea83 Mon Sep 17 00:00:00 2001
From: Vish Kannan <vishh@users.noreply.github.com>
Date: Fri, 3 Jun 2016 14:41:05 -0700
Subject: [PATCH 2/2] Remove debug log line

---
 test/e2e_node/e2e_remote.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e_node/e2e_remote.go b/test/e2e_node/e2e_remote.go
index 8abb467ceb6..20f4280664b 100644
--- a/test/e2e_node/e2e_remote.go
+++ b/test/e2e_node/e2e_remote.go
@@ -188,7 +188,6 @@ func RunRemote(archive string, host string, cleanup bool, junitFileNumber int) (
 	glog.Infof("Copying test artifacts from %s", host)
 	scpErr := getTestArtifacts(host, tmp)
 	exitOk := true
-	glog.Errorf("vishh: %v", scpErr)
 	if scpErr != nil {
 		// Only exit non-0 if the scp failed
 		exitOk = false