Made test device caches in node_test.go

Author: julianKatz

pkg/gce-pd-csi-driver/node_test.go

@@ -35,6 +35,7 @@ import (
 	"k8s.io/mount-utils"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"
 	metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
+	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/linkcache"
 	mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
 )
 
@@ -45,11 +46,13 @@ const (
 )
 
 func getTestGCEDriver(t *testing.T) *GCEDriver {
-	return getCustomTestGCEDriver(t, mountmanager.NewFakeSafeMounter(), deviceutils.NewFakeDeviceUtils(false), metadataservice.NewFakeService(), &NodeServerArgs{})
+	return getCustomTestGCEDriver(t, mountmanager.NewFakeSafeMounter(), deviceutils.NewFakeDeviceUtils(false), metadataservice.NewFakeService(), &NodeServerArgs{
+		DeviceCache: linkcache.TestDeviceCache(1*time.Minute, linkcache.TestNodeWithVolumes([]string{defaultVolumeID})),
+	})
 }
 
-func getTestGCEDriverWithCustomMounter(t *testing.T, mounter *mount.SafeFormatAndMount) *GCEDriver {
-	return getCustomTestGCEDriver(t, mounter, deviceutils.NewFakeDeviceUtils(false), metadataservice.NewFakeService(), &NodeServerArgs{})
+func getTestGCEDriverWithCustomMounter(t *testing.T, mounter *mount.SafeFormatAndMount, args *NodeServerArgs) *GCEDriver {
+	return getCustomTestGCEDriver(t, mounter, deviceutils.NewFakeDeviceUtils(false), metadataservice.NewFakeService(), args)
 }
 
 func getCustomTestGCEDriver(t *testing.T, mounter *mount.SafeFormatAndMount, deviceUtils deviceutils.DeviceUtils, metaService metadataservice.MetadataService, args *NodeServerArgs) *GCEDriver {
@@ -189,7 +192,9 @@ func TestNodeGetVolumeStats(t *testing.T) {
 			}
 
 			mounter := mountmanager.NewFakeSafeMounterWithCustomExec(&testingexec.FakeExec{CommandScript: actionList})
-			gceDriver := getTestGCEDriverWithCustomMounter(t, mounter)
+			gceDriver := getTestGCEDriverWithCustomMounter(t, mounter, &NodeServerArgs{
+				DeviceCache: linkcache.TestDeviceCache(1*time.Minute, linkcache.TestNodeWithVolumes([]string{tc.volumeID})),
+			})
 			ns := gceDriver.ns
 
 			req := &csi.NodeGetVolumeStatsRequest{
@@ -1246,7 +1251,9 @@ func TestNodeStageVolume(t *testing.T) {
 				))
 			}
 			mounter := mountmanager.NewFakeSafeMounterWithCustomExec(&testingexec.FakeExec{CommandScript: actionList, ExactOrder: true})
-			gceDriver := getTestGCEDriverWithCustomMounter(t, mounter)
+			gceDriver := getTestGCEDriverWithCustomMounter(t, mounter, &NodeServerArgs{
+				DeviceCache: linkcache.TestDeviceCache(1*time.Minute, linkcache.TestNodeWithVolumes([]string{volumeID})),
+			})
 			ns := gceDriver.ns
 			ns.SysfsPath = tempDir + "/sys"
 			_, err := ns.NodeStageVolume(context.Background(), tc.req)

pkg/linkcache/devices_linux.go

@@ -21,10 +21,27 @@ func NewDeviceCacheForNode(ctx context.Context, period time.Duration, nodeName s
 		return nil, fmt.Errorf("failed to get node %s: %w", nodeName, err)
 	}
 
-	return newDeviceCacheForNode(ctx, period, node)
+	return newDeviceCacheForNode(period, node), nil
 }
 
-func newDeviceCacheForNode(ctx context.Context, period time.Duration, node *v1.Node) (*DeviceCache, error) {
+func TestDeviceCache(period time.Duration, node *v1.Node) *DeviceCache {
+	return newDeviceCacheForNode(period, node)
+}
+
+func TestNodeWithVolumes(volumes []string) *v1.Node {
+	volumesInUse := make([]v1.UniqueVolumeName, len(volumes))
+	for i, volume := range volumes {
+		volumesInUse[i] = v1.UniqueVolumeName("kubernetes.io/csi/pd.csi.storage.gke.io^" + volume)
+	}
+
+	return &v1.Node{
+		Status: v1.NodeStatus{
+			VolumesInUse: volumesInUse,
+		},
+	}
+}
+
+func newDeviceCacheForNode(period time.Duration, node *v1.Node) *DeviceCache {
 	deviceCache := &DeviceCache{
 		volumes: make(map[string]deviceMapping),
 		period:  period,
@@ -35,11 +52,23 @@ func newDeviceCacheForNode(ctx context.Context, period time.Duration, node *v1.N
 	// of the string (after the last "/") and call AddVolume for that
 	for _, volume := range node.Status.VolumesInUse {
 		klog.Infof("Adding volume %s to cache", string(volume))
-		volumeID := strings.Split(string(volume), "^")[1]
-		deviceCache.AddVolume(volumeID)
+		vID, err := pvNameFromVolumeID(string(volume))
+		if err != nil {
+			klog.Warningf("failure to retrieve name, skipping volume %q: %v", string(volume), err)
+			continue
+		}
+		deviceCache.AddVolume(vID)
 	}
 
-	return deviceCache, nil
+	return deviceCache
+}
+
+func pvNameFromVolumeID(volumeID string) (string, error) {
+	tokens := strings.Split(volumeID, "^")
+	if len(tokens) != 2 {
+		return "", fmt.Errorf("invalid volume ID, split on `^` returns %d tokens, expected 2", len(tokens))
+	}
+	return tokens[1], nil
 }
 
 // Run since it needs an infinite loop to keep itself up to date