Merge pull request #556 from replicatedhq/emosbaugh/sc-45934/longhorn-logs-collector-all-files-are-empty

Fix missing longhorn logs

Author: emosbaugh

pkg/collect/ceph.go

@@ -3,7 +3,6 @@ package collect
 import (
 	"context"
 	"fmt"
-	"io"
 	"os"
 	"path"
 	"strings"
@@ -133,8 +132,8 @@ func cephCommandExec(ctx context.Context, c *Collector, cephCollector *troublesh
 		return errors.Wrap(err, "failed to exec command")
 	}
 
+	pathPrefix := GetCephCollectorFilepath(cephCollector.CollectorName, cephCollector.Namespace)
 	for srcFilename, _ := range results {
-		pathPrefix := GetCephCollectorFilepath(cephCollector.CollectorName, cephCollector.Namespace)
 		var dstFileName string
 		switch {
 		case strings.HasSuffix(srcFilename, "-stdout.txt"):
@@ -203,10 +202,7 @@ func copyResult(srcResult CollectorResult, dstResult CollectorResult, bundlePath
 		}
 		return errors.Wrap(err, "failed to get reader")
 	}
-
-	if reader, ok := reader.(io.ReadCloser); ok {
-		defer reader.Close()
-	}
+	defer reader.Close()
 
 	err = dstResult.SaveResult(bundlePath, dstKey, reader)
 	if err != nil {

pkg/collect/longhorn.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"path"
 	"path/filepath"
 	"regexp"
 	"sync"
@@ -205,9 +206,12 @@ func Longhorn(c *Collector, longhornCollector *troubleshootv1beta2.Longhorn) (Co
 		return nil, errors.Wrap(err, "collect longhorn logs")
 	}
 	logsDir := GetLonghornLogsDirectory(ns)
-	for key, log := range logs {
-		key = filepath.Join(logsDir, key)
-		output.SaveResult(c.BundlePath, key, bytes.NewBuffer(log))
+	for srcFilename, _ := range logs {
+		dstFileName := path.Join(logsDir, srcFilename)
+		err := copyResult(logs, output, c.BundlePath, srcFilename, dstFileName)
+		if err != nil {
+			logger.Printf("Failed to copy file %s; %v", srcFilename, err)
+		}
 	}
 
 	// https://longhorn.io/docs/1.1.1/advanced-resources/data-recovery/corrupted-replica/

pkg/collect/redact.go

@@ -26,9 +26,7 @@ func redactResult(bundlePath string, input CollectorResult, additionalRedactors
 				}
 				return errors.Wrap(err, "failed to get reader")
 			}
-			if r, ok := r.(io.ReadCloser); ok {
-				defer r.Close()
-			}
+			defer r.Close()
 
 			reader = r
 		} else {

pkg/collect/result.go

@@ -85,9 +85,9 @@ func (r CollectorResult) ReplaceResult(bundlePath string, relativePath string, r
 	return nil
 }
 
-func (r CollectorResult) GetReader(bundlePath string, relativePath string) (io.Reader, error) {
+func (r CollectorResult) GetReader(bundlePath string, relativePath string) (io.ReadCloser, error) {
 	if r[relativePath] != nil {
-		return bytes.NewReader(r[relativePath]), nil
+		return ioutil.NopCloser(bytes.NewReader(r[relativePath])), nil
 	}
 
 	if bundlePath == "" {