Merge pull request #129 from davidz627/feature/migrationSupport

Support UNSPECIFIED zone and project in volume ID. Static driver name. To prep for migration

Author: k8s-ci-robot

cmd/main.go

@@ -34,10 +34,13 @@ func init() {
 
 var (
 	endpoint      = flag.String("endpoint", "unix:/tmp/csi.sock", "CSI endpoint")
-	driverName    = flag.String("drivername", "com.google.csi.gcepd", "name of the driver")
 	vendorVersion string
 )
 
+const (
+	driverName = "com.google.csi.gcepd"
+)
+
 func main() {
 	flag.Parse()
 	rand.Seed(time.Now().UnixNano())
@@ -67,7 +70,7 @@ func handle() {
 		glog.Fatalf("Failed to set up metadata service: %v", err)
 	}
 
-	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, deviceUtils, ms, *driverName, vendorVersion)
+	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, deviceUtils, ms, driverName, vendorVersion)
 	if err != nil {
 		glog.Fatalf("Failed to initialize GCE CSI Driver: %v", err)
 	}

pkg/common/constants.go

@@ -26,4 +26,6 @@ const (
 
 	// VolumeAttributes for Partition
 	VolumeAttributePartition = "partition"
+
+	UnspecifiedValue = "UNSPECIFIED"
 )

pkg/common/utils.go

@@ -27,7 +27,9 @@ import (
 const (
 	// Volume ID Expected Format
 	// "projects/{projectName}/zones/{zoneName}/disks/{diskName}"
+	volIDZonalFmt = "projects/%s/zones/%s/disks/%s"
 	// "projects/{projectName}/regions/{regionName}/disks/{diskName}"
+	volIDRegionalFmt   = "projects/%s/regions/%s/disks/%s"
 	volIDToplogyKey    = 2
 	volIDToplogyValue  = 3
 	volIDDiskNameValue = 5
@@ -71,6 +73,13 @@ func VolumeIDToKey(id string) (*meta.Key, error) {
 	}
 }
 
+func GenerateUnderspecifiedVolumeID(diskName string, isZonal bool) string {
+	if isZonal {
+		return fmt.Sprintf(volIDZonalFmt, UnspecifiedValue, UnspecifiedValue, diskName)
+	}
+	return fmt.Sprintf(volIDRegionalFmt, UnspecifiedValue, UnspecifiedValue, diskName)
+}
+
 func SnapshotIDToKey(id string) (string, error) {
 	splitId := strings.Split(id, "/")
 	if len(splitId) != snapshotTotalElements {

pkg/gce-cloud-provider/compute/cloud-disk.go

@@ -123,3 +123,14 @@ func (d *CloudDisk) GetSizeGb() int64 {
 		return -1
 	}
 }
+
+func (d *CloudDisk) GetZone() string {
+	switch d.Type() {
+	case Zonal:
+		return d.ZonalDisk.Zone
+	case Regional:
+		return d.RegionalDisk.Zone
+	default:
+		return ""
+	}
+}

pkg/gce-cloud-provider/compute/fake-gce.go

@@ -49,17 +49,49 @@ type FakeCloudProvider struct {
 
 var _ GCECompute = &FakeCloudProvider{}
 
-func FakeCreateCloudProvider(project, zone string) (*FakeCloudProvider, error) {
-	return &FakeCloudProvider{
+func FakeCreateCloudProvider(project, zone string, cloudDisks []*CloudDisk) (*FakeCloudProvider, error) {
+	fcp := &FakeCloudProvider{
 		project:   project,
 		zone:      zone,
 		disks:     map[string]*CloudDisk{},
 		instances: map[string]*compute.Instance{},
 		snapshots: map[string]*compute.Snapshot{},
-	}, nil
+	}
+	for _, d := range cloudDisks {
+		fcp.disks[d.GetName()] = d
+	}
+	return fcp, nil
 
 }
 
+func (cloud *FakeCloudProvider) RepairUnderspecifiedVolumeKey(ctx context.Context, volumeKey *meta.Key) (*meta.Key, error) {
+	switch volumeKey.Type() {
+	case meta.Zonal:
+		if volumeKey.Zone != common.UnspecifiedValue {
+			return volumeKey, nil
+		}
+		for name, d := range cloud.disks {
+			if name == volumeKey.Name {
+				volumeKey.Zone = d.GetZone()
+				return volumeKey, nil
+			}
+		}
+		return nil, fmt.Errorf("Couldn't repair unspecified volume information")
+	case meta.Regional:
+		if volumeKey.Region != common.UnspecifiedValue {
+			return volumeKey, nil
+		}
+		r, err := common.GetRegionFromZones([]string{cloud.zone})
+		if err != nil {
+			return nil, fmt.Errorf("failed to get region from zones: %v", err)
+		}
+		volumeKey.Region = r
+		return volumeKey, nil
+	default:
+		return nil, fmt.Errorf("Volume key %v not zonal nor regional", volumeKey.Name)
+	}
+}
+
 func (cloud *FakeCloudProvider) ListZones(ctx context.Context, region string) ([]string, error) {
 	return []string{cloud.zone, "country-region-fakesecondzone"}, nil
 }
@@ -195,16 +227,19 @@ func (cloud *FakeCloudProvider) InsertDisk(ctx context.Context, volKey *meta.Key
 }
 
 func (cloud *FakeCloudProvider) DeleteDisk(ctx context.Context, volKey *meta.Key) error {
+	if _, ok := cloud.disks[volKey.Name]; !ok {
+		return notFoundError()
+	}
 	delete(cloud.disks, volKey.Name)
 	return nil
 }
 
-func (cloud *FakeCloudProvider) AttachDisk(ctx context.Context, disk *CloudDisk, volKey *meta.Key, readWrite, diskType, instanceZone, instanceName string) error {
+func (cloud *FakeCloudProvider) AttachDisk(ctx context.Context, volKey *meta.Key, readWrite, diskType, instanceZone, instanceName string) error {
 	source := cloud.GetDiskSourceURI(volKey)
 
 	attachedDiskV1 := &compute.AttachedDisk{
-		DeviceName: disk.GetName(),
-		Kind:       disk.GetKind(),
+		DeviceName: volKey.Name,
+		Kind:       diskKind,
 		Mode:       readWrite,
 		Source:     source,
 		Type:       diskType,
@@ -217,14 +252,14 @@ func (cloud *FakeCloudProvider) AttachDisk(ctx context.Context, disk *CloudDisk,
 	return nil
 }
 
-func (cloud *FakeCloudProvider) DetachDisk(ctx context.Context, volKey *meta.Key, instanceZone, instanceName string) error {
+func (cloud *FakeCloudProvider) DetachDisk(ctx context.Context, deviceName, instanceZone, instanceName string) error {
 	instance, ok := cloud.instances[instanceName]
 	if !ok {
 		return fmt.Errorf("Failed to get instance %v", instanceName)
 	}
 	found := -1
 	for i, disk := range instance.Disks {
-		if disk.DeviceName == volKey.Name {
+		if disk.DeviceName == deviceName {
 			found = i
 			break
 		}

pkg/gce-cloud-provider/compute/gce-compute.go

@@ -34,16 +34,18 @@ import (
 const (
 	operationStatusDone            = "DONE"
 	waitForSnapshotCreationTimeOut = 2 * time.Minute
+	diskKind                       = "compute#disk"
 )
 
 type GCECompute interface {
 	// Disk Methods
 	GetDisk(ctx context.Context, volumeKey *meta.Key) (*CloudDisk, error)
+	RepairUnderspecifiedVolumeKey(ctx context.Context, volumeKey *meta.Key) (*meta.Key, error)
 	ValidateExistingDisk(ctx context.Context, disk *CloudDisk, diskType string, reqBytes, limBytes int64) error
 	InsertDisk(ctx context.Context, volKey *meta.Key, diskType string, capBytes int64, capacityRange *csi.CapacityRange, replicaZones []string) error
 	DeleteDisk(ctx context.Context, volumeKey *meta.Key) error
-	AttachDisk(ctx context.Context, disk *CloudDisk, volKey *meta.Key, readWrite, diskType, instanceZone, instanceName string) error
-	DetachDisk(ctx context.Context, volKey *meta.Key, instanceZone, instanceName string) error
+	AttachDisk(ctx context.Context, volKey *meta.Key, readWrite, diskType, instanceZone, instanceName string) error
+	DetachDisk(ctx context.Context, deviceName string, instanceZone, instanceName string) error
 	GetDiskSourceURI(volKey *meta.Key) string
 	GetDiskTypeURI(volKey *meta.Key, diskType string) string
 	WaitForAttach(ctx context.Context, volKey *meta.Key, instanceZone, instanceName string) error
@@ -59,7 +61,46 @@ type GCECompute interface {
 	DeleteSnapshot(ctx context.Context, snapshotName string) error
 }
 
+// RepairUnderspecifiedVolumeKey will query the cloud provider and check each zone for the disk specified
+// by the volume key and return a volume key with a correct zone
+func (cloud *CloudProvider) RepairUnderspecifiedVolumeKey(ctx context.Context, volumeKey *meta.Key) (*meta.Key, error) {
+	region, err := common.GetRegionFromZones([]string{cloud.zone})
+	if err != nil {
+		return nil, fmt.Errorf("failed to get region from zones: %v", err)
+	}
+	switch volumeKey.Type() {
+	case meta.Zonal:
+		if volumeKey.Zone == common.UnspecifiedValue {
+			// list all zones, try to get disk in each zone
+			zones, err := cloud.ListZones(ctx, region)
+			if err != nil {
+				return nil, err
+			}
+			for _, zone := range zones {
+				_, err := cloud.getZonalDiskOrError(ctx, zone, volumeKey.Name)
+				if err == nil {
+					// If there is no error we have found a disk
+					volumeKey.Zone = zone
+					return volumeKey, nil
+				}
+			}
+			return nil, fmt.Errorf("volume zone unspecified and unable to find in any of these zones %v", zones)
+		}
+		return volumeKey, nil
+	case meta.Regional:
+		if volumeKey.Region == common.UnspecifiedValue {
+			volumeKey.Region = region
+		}
+		return volumeKey, nil
+	default:
+		return nil, fmt.Errorf("key was neither zonal nor regional, got: %v", volumeKey.String())
+	}
+}
+
 func (cloud *CloudProvider) ListZones(ctx context.Context, region string) ([]string, error) {
+	if len(cloud.zonesCache[region]) > 0 {
+		return cloud.zonesCache[region], nil
+	}
 	zones := []string{}
 	zoneList, err := cloud.service.Zones.List(cloud.project).Filter(fmt.Sprintf("region eq .*%s$", region)).Do()
 	if err != nil {
@@ -68,6 +109,7 @@ func (cloud *CloudProvider) ListZones(ctx context.Context, region string) ([]str
 	for _, zone := range zoneList.Items {
 		zones = append(zones, zone.Name)
 	}
+	cloud.zonesCache[region] = zones
 	return zones, nil
 
 }
@@ -315,7 +357,7 @@ func (cloud *CloudProvider) deleteRegionalDisk(ctx context.Context, region, name
 	return nil
 }
 
-func (cloud *CloudProvider) AttachDisk(ctx context.Context, disk *CloudDisk, volKey *meta.Key, readWrite, diskType, instanceZone, instanceName string) error {
+func (cloud *CloudProvider) AttachDisk(ctx context.Context, volKey *meta.Key, readWrite, diskType, instanceZone, instanceName string) error {
 	source := cloud.GetDiskSourceURI(volKey)
 
 	deviceName, err := common.GetDeviceName(volKey)
@@ -324,7 +366,7 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, disk *CloudDisk, vol
 	}
 	attachedDiskV1 := &compute.AttachedDisk{
 		DeviceName: deviceName,
-		Kind:       disk.GetKind(),
+		Kind:       diskKind,
 		Mode:       readWrite,
 		Source:     source,
 		Type:       diskType,
@@ -341,12 +383,7 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, disk *CloudDisk, vol
 	return nil
 }
 
-func (cloud *CloudProvider) DetachDisk(ctx context.Context, volKey *meta.Key, instanceZone, instanceName string) error {
-	deviceName, err := common.GetDeviceName(volKey)
-	if err != nil {
-		return err
-	}
-
+func (cloud *CloudProvider) DetachDisk(ctx context.Context, deviceName, instanceZone, instanceName string) error {
 	op, err := cloud.service.Instances.DetachDisk(cloud.project, instanceZone, instanceName, deviceName).Context(ctx).Do()
 	if err != nil {
 		return err

pkg/gce-cloud-provider/compute/gce.go

@@ -51,6 +51,8 @@ type CloudProvider struct {
 	betaService *beta.Service
 	project     string
 	zone        string
+
+	zonesCache map[string]([]string)
 }
 
 var _ GCECompute = &CloudProvider{}
@@ -76,6 +78,7 @@ func CreateCloudProvider(vendorVersion string) (*CloudProvider, error) {
 		betaService: betasvc,
 		project:     project,
 		zone:        zone,
+		zonesCache:  make(map[string]([]string)),
 	}, nil
 
 }

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

@@ -191,6 +191,11 @@ func (gceCS *GCEControllerServer) DeleteVolume(ctx context.Context, req *csi.Del
 		return &csi.DeleteVolumeResponse{}, nil
 	}
 
+	volKey, err = gceCS.CloudProvider.RepairUnderspecifiedVolumeKey(ctx, volKey)
+	if err != nil {
+		return nil, status.Error(codes.NotFound, fmt.Sprintf("Could not find volume with ID %v: %v", volumeID, err))
+	}
+
 	err = gceCS.CloudProvider.DeleteDisk(ctx, volKey)
 	if err != nil {
 		return nil, status.Error(codes.Internal, fmt.Sprintf("unknown Delete disk error: %v", err))
@@ -222,13 +227,17 @@ func (gceCS *GCEControllerServer) ControllerPublishVolume(ctx context.Context, r
 		return nil, status.Error(codes.NotFound, fmt.Sprintf("Could not find volume with ID %v: %v", volumeID, err))
 	}
 
+	volKey, err = gceCS.CloudProvider.RepairUnderspecifiedVolumeKey(ctx, volKey)
+	if err != nil {
+		return nil, status.Error(codes.NotFound, fmt.Sprintf("Could not find volume with ID %v: %v", volumeID, err))
+	}
 	// TODO(#94): Check volume capability matches
 
 	pubVolResp := &csi.ControllerPublishVolumeResponse{
 		PublishInfo: nil,
 	}
 
-	disk, err := gceCS.CloudProvider.GetDisk(ctx, volKey)
+	_, err = gceCS.CloudProvider.GetDisk(ctx, volKey)
 	if err != nil {
 		if gce.IsGCEError(err, "notFound") {
 			return nil, status.Error(codes.NotFound, fmt.Sprintf("Could not find disk %v: %v", volKey.String(), err))
@@ -270,7 +279,7 @@ func (gceCS *GCEControllerServer) ControllerPublishVolume(ctx context.Context, r
 	if err != nil {
 		return nil, status.Error(codes.InvalidArgument, fmt.Sprintf("could not split nodeID: %v", err))
 	}
-	err = gceCS.CloudProvider.AttachDisk(ctx, disk, volKey, readWrite, attachableDiskTypePersistent, instanceZone, instanceName)
+	err = gceCS.CloudProvider.AttachDisk(ctx, volKey, readWrite, attachableDiskTypePersistent, instanceZone, instanceName)
 	if err != nil {
 		return nil, status.Error(codes.Internal, fmt.Sprintf("unknown Attach error: %v", err))
 	}
@@ -282,7 +291,7 @@ func (gceCS *GCEControllerServer) ControllerPublishVolume(ctx context.Context, r
 		return nil, status.Error(codes.Internal, fmt.Sprintf("unknown WaitForAttach error: %v", err))
 	}
 
-	glog.V(4).Infof("Disk %v attached to instance %v successfully", disk.GetName(), nodeID)
+	glog.V(4).Infof("Disk %v attached to instance %v successfully", volKey.Name, nodeID)
 	return pubVolResp, nil
 }
 
@@ -326,7 +335,7 @@ func (gceCS *GCEControllerServer) ControllerUnpublishVolume(ctx context.Context,
 		return &csi.ControllerUnpublishVolumeResponse{}, nil
 	}
 
-	err = gceCS.CloudProvider.DetachDisk(ctx, volKey, instanceZone, instanceName)
+	err = gceCS.CloudProvider.DetachDisk(ctx, deviceName, instanceZone, instanceName)
 	if err != nil {
 		return nil, status.Error(codes.Internal, fmt.Sprintf("unknown detach error: %v", err))
 	}