Merge pull request #378 from replicatedhq/longhorn-ns

Always use longhorn namespace

pkg/collect/longhorn.go

@@ -7,12 +7,14 @@ import (
 	"fmt"
 	"path/filepath"
 	"regexp"
+	"sync"
 
 	longhornv1beta1types "github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta1"
 	longhornv1beta1 "github.com/longhorn/longhorn-manager/k8s/pkg/client/clientset/versioned/typed/longhorn/v1beta1"
 	longhorntypes "github.com/longhorn/longhorn-manager/types"
 	"github.com/pkg/errors"
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
+	"github.com/replicatedhq/troubleshoot/pkg/logger"
 	"gopkg.in/yaml.v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -40,6 +42,7 @@ func Longhorn(c *Collector, longhornCollector *troubleshootv1beta2.Longhorn) (ma
 	}
 
 	final := map[string][]byte{}
+	var mtx sync.Mutex
 
 	// collect nodes.longhorn.io
 	nodes, err := client.Nodes(ns).List(ctx, metav1.ListOptions{})
@@ -213,6 +216,8 @@ func Longhorn(c *Collector, longhornCollector *troubleshootv1beta2.Longhorn) (ma
 	// exec into that pod and get the sha256sum of all files in the replica data directory.
 	var replicaPodsByNode map[string]string
 
+	var wg sync.WaitGroup
+
 	for _, volume := range volumes.Items {
 		if volume.Status.State != longhorntypes.VolumeStateDetached {
 			// cannot checksum volumes in use
@@ -224,6 +229,9 @@ func Longhorn(c *Collector, longhornCollector *troubleshootv1beta2.Longhorn) (ma
 			if replica.Spec.InstanceSpec.VolumeName != volume.Name {
 				continue
 			}
+			if replica.Spec.InstanceSpec.NodeID == "" {
+				continue
+			}
 			volReplicas = append(volReplicas, replica)
 		}
 		if len(volReplicas) <= 1 {
@@ -251,94 +259,70 @@ func Longhorn(c *Collector, longhornCollector *troubleshootv1beta2.Longhorn) (ma
 				continue
 			}
 
-			checksums, err := GetLonghornReplicaChecksum(c.ClientConfig, replica, podName)
-			if err != nil {
-				return nil, err
-			}
-			volsDir := GetLonghornVolumesDirectory(ns)
-			key := filepath.Join(volsDir, volume.Name, "replicachecksums", replica.Name+".txt")
-			final[key] = []byte(checksums)
+			wg.Add(1)
+			go func(replica longhornv1beta1types.Replica) {
+				defer wg.Done()
+				checksums, err := GetLonghornReplicaChecksum(c.ClientConfig, replica, podName)
+				if err != nil {
+					logger.Printf("Failed to get replica %s checksum: %v", replica.Name, err)
+					return
+				}
+				volsDir := GetLonghornVolumesDirectory(ns)
+				key := filepath.Join(volsDir, volume.Name, "replicachecksums", replica.Name+".txt")
+				mtx.Lock()
+				final[key] = []byte(checksums)
+				mtx.Unlock()
+			}(replica)
 		}
 	}
 
+	wg.Wait()
+
 	return final, nil
 }
 
 func GetLonghornNodesDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/nodes", namespace)
-	}
-	return "longhorn/nodes"
+	return fmt.Sprintf("longhorn/%s/nodes", namespace)
 }
 
 func GetLonghornVolumesDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/volumes", namespace)
-	}
-	return "longhorn/volumes"
+	return fmt.Sprintf("longhorn/%s/volumes", namespace)
 }
 
 func GetLonghornReplicasDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/replicas", namespace)
-	}
-	return "longhorn/replicas"
+	return fmt.Sprintf("longhorn/%s/replicas", namespace)
 }
 
 func GetLonghornEnginesDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/engines", namespace)
-	}
-	return "longhorn/engines"
+	return fmt.Sprintf("longhorn/%s/engines", namespace)
 }
 
 func GetLonghornEngineImagesDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/engineimages", namespace)
-	}
-	return "longhorn/engineimages"
+	return fmt.Sprintf("longhorn/%s/engineimages", namespace)
 }
 
 func GetLonghornInstanceManagersDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/instancemanagers", namespace)
-	}
-	return "longhorn/instancemanagers"
+	return fmt.Sprintf("longhorn/%s/instancemanagers", namespace)
 }
 
 func GetLonghornBackingImageManagersDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/backingimagemanagers", namespace)
-	}
-	return "longhorn/backingimagemanagers"
+	return fmt.Sprintf("longhorn/%s/backingimagemanagers", namespace)
 }
 
 func GetLonghornBackingImagesDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/backingimages", namespace)
-	}
-	return "longhorn/backingimages"
+	return fmt.Sprintf("longhorn/%s/backingimages", namespace)
 }
 
 func GetLonghornShareManagersDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/sharemanagers", namespace)
-	}
-	return "longhorn/sharemanagers"
+	return fmt.Sprintf("longhorn/%s/sharemanagers", namespace)
 }
 
 func GetLonghornSettingsFile(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/settings.yaml", namespace)
-	}
-	return "longhorn/settings.yaml"
+	return fmt.Sprintf("longhorn/%s/settings.yaml", namespace)
 }
 
 func GetLonghornLogsDirectory(namespace string) string {
-	if namespace != DefaultLonghornNamespace {
-		return fmt.Sprintf("longhorn/%s/logs", namespace)
-	}
-	return "longhorn/logs"
+	return fmt.Sprintf("longhorn/%s/logs", namespace)
 }
 
 func GetLonghornReplicaChecksum(clientConfig *rest.Config, replica longhornv1beta1types.Replica, podName string) (string, error) {
@@ -346,6 +330,7 @@ func GetLonghornReplicaChecksum(clientConfig *rest.Config, replica longhornv1bet
 	if err != nil {
 		return "", err
 	}
+	dir := fmt.Sprintf("/host/var/lib/longhorn/replicas/%s", replica.Spec.DataDirectoryName)
 
 	req := client.
 		CoreV1().
@@ -360,7 +345,7 @@ func GetLonghornReplicaChecksum(clientConfig *rest.Config, replica longhornv1bet
 		Param("stdin", "true").
 		Param("command", "/bin/bash").
 		Param("command", "-c").
-		Param("command", fmt.Sprintf("sha256sum /host/var/lib/longhorn/replicas/%s/*", replica.Spec.DataDirectoryName))
+		Param("command", fmt.Sprintf("if [ -d %s ]; then md5sum %s/*; fi", dir, dir))
 
 	executor, err := remotecommand.NewSPDYExecutor(clientConfig, "POST", req.URL())
 	if err != nil {