Feature: Changes to support Hyperdisk Multi-Writer mode by moving to Beta APIs. #1919
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -99,7 +99,7 @@ type GCECompute interface { | |
| GetDefaultProject() string | ||
| GetDefaultZone() string | ||
| // Disk Methods | ||
| GetDisk(ctx context.Context, project string, volumeKey *meta.Key) (*CloudDisk, error) | ||
| RepairUnderspecifiedVolumeKey(ctx context.Context, project string, volumeKey *meta.Key) (string, *meta.Key, error) | ||
| ValidateExistingDisk(ctx context.Context, disk *CloudDisk, params common.DiskParameters, reqBytes, limBytes int64, multiWriter bool) error | ||
| InsertDisk(ctx context.Context, project string, volKey *meta.Key, params common.DiskParameters, capBytes int64, capacityRange *csi.CapacityRange, replicaZones []string, snapshotID string, volumeContentSourceVolumeID string, multiWriter bool, accessMode string) error | ||
|
|
@@ -321,28 +321,16 @@ func (cloud *CloudProvider) ListSnapshots(ctx context.Context, filter string) ([ | |
| return items, "", nil | ||
| } | ||
|
|
||
| func (cloud *CloudProvider) GetDisk(ctx context.Context, project string, key *meta.Key) (*CloudDisk, error) { | ||
| klog.V(5).Infof("Getting disk %v", key) | ||
|
|
||
| switch key.Type() { | ||
| case meta.Zonal: | ||
| disk, err := cloud.getZonalBetaDiskOrError(ctx, project, key.Zone, key.Name) | ||
| return CloudDiskFromBeta(disk), err | ||
| case meta.Regional: | ||
| disk, err := cloud.getRegionalBetaDiskOrError(ctx, project, key.Region, key.Name) | ||
| return CloudDiskFromBeta(disk), err | ||
| default: | ||
| return nil, fmt.Errorf("key was neither zonal nor regional, got: %v", key.String()) | ||
| } | ||
|
|
@@ -407,11 +395,6 @@ func (cloud *CloudProvider) ValidateExistingDisk(ctx context.Context, resp *Clou | |
| reqBytes, common.GbToBytes(resp.GetSizeGb()), limBytes) | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Ditto, we should keep the multiwriter check. Hmm, this won't verify that a hyperdisk is multiwriter, however, since we aren't passing in the access mode. It looks like it's just called from the one place in pk/gce-pd-csi-driver/controller.go, so should be easy to add accessMode to the method (this makes it parallel to the insert disk call. Part of me thinks we should push this detail of how multiwriter is declared down into cloud disk, but we can defer that for now, HdHA might clarify the question). There was a problem hiding this comment. HdHA PR has already been merged by the way: #1915 |
||
| return ValidateDiskParameters(resp, params) | ||
| } | ||
|
|
||
|
|
@@ -553,9 +536,6 @@ func convertV1DiskToBetaDisk(v1Disk *computev1.Disk) *computebeta.Disk { | |
| AccessMode: v1Disk.AccessMode, | ||
| } | ||
|
|
||
| if v1Disk.ProvisionedIops > 0 { | ||
| betaDisk.ProvisionedIops = v1Disk.ProvisionedIops | ||
| } | ||
|
|
@@ -619,9 +599,6 @@ func convertBetaDiskToV1Disk(betaDisk *computebeta.Disk) *computev1.Disk { | |
| AccessMode: betaDisk.AccessMode, | ||
| } | ||
|
|
||
| if betaDisk.ProvisionedIops > 0 { | ||
| v1Disk.ProvisionedIops = betaDisk.ProvisionedIops | ||
| } | ||
|
|
@@ -646,16 +623,11 @@ func (cloud *CloudProvider) insertRegionalDisk( | |
| description string, | ||
| multiWriter bool) error { | ||
| var ( | ||
| err error | ||
| opName string | ||
| ) | ||
|
|
||
| diskToCreate := &computebeta.Disk{ | ||
| Name: volKey.Name, | ||
| SizeGb: common.BytesToGbRoundUp(capBytes), | ||
| Description: description, | ||
|
|
@@ -684,7 +656,7 @@ func (cloud *CloudProvider) insertRegionalDisk( | |
| diskToCreate.ReplicaZones = replicaZones | ||
| } | ||
| if params.DiskEncryptionKMSKey != "" { | ||
| diskToCreate.DiskEncryptionKey = &computebeta.CustomerEncryptionKey{ | ||
| KmsKeyName: params.DiskEncryptionKMSKey, | ||
| } | ||
| } | ||
|
|
@@ -694,29 +666,21 @@ func (cloud *CloudProvider) insertRegionalDisk( | |
| } | ||
|
|
||
| if len(resourceTags) > 0 { | ||
| diskToCreate.Params = &computebeta.DiskParams{ | ||
| ResourceManagerTags: resourceTags, | ||
| } | ||
| } | ||
|
|
||
| var insertOp *computebeta.Operation | ||
| diskToCreate.MultiWriter = multiWriter | ||
| insertOp, err = cloud.betaService.RegionDisks.Insert(project, volKey.Region, diskToCreate).Context(ctx).Do() | ||
| if insertOp != nil { | ||
| opName = insertOp.Name | ||
| } | ||
|
|
||
| if err != nil { | ||
| if IsGCEError(err, "alreadyExists") { | ||
| disk, err := cloud.GetDisk(ctx, project, volKey) | ||
| if err != nil { | ||
| // failed to GetDisk, however the Disk may already exist | ||
| // the error code should be non-Final | ||
|
|
@@ -742,7 +706,7 @@ func (cloud *CloudProvider) insertRegionalDisk( | |
| // the error code returned should be non-final | ||
| if err != nil { | ||
| if IsGCEError(err, "alreadyExists") { | ||
| disk, err := cloud.GetDisk(ctx, project, volKey) | ||
| if err != nil { | ||
| return common.NewTemporaryError(codes.Unavailable, fmt.Errorf("error when getting disk: %w", err)) | ||
| } | ||
|
|
@@ -774,15 +738,11 @@ func (cloud *CloudProvider) insertZonalDisk( | |
| multiWriter bool, | ||
| accessMode string) error { | ||
| var ( | ||
| err error | ||
| opName string | ||
| ) | ||
|
|
||
| diskToCreate := &computebeta.Disk{ | ||
| Name: volKey.Name, | ||
| SizeGb: common.BytesToGbRoundUp(capBytes), | ||
| Description: description, | ||
|
|
@@ -824,7 +784,7 @@ func (cloud *CloudProvider) insertZonalDisk( | |
| } | ||
|
|
||
| if params.DiskEncryptionKMSKey != "" { | ||
| diskToCreate.DiskEncryptionKey = &computebeta.CustomerEncryptionKey{ | ||
| KmsKeyName: params.DiskEncryptionKMSKey, | ||
| } | ||
| } | ||
|
|
@@ -836,31 +796,22 @@ func (cloud *CloudProvider) insertZonalDisk( | |
| } | ||
|
|
||
| if len(resourceTags) > 0 { | ||
| diskToCreate.Params = &computebeta.DiskParams{ | ||
| ResourceManagerTags: resourceTags, | ||
| } | ||
| } | ||
|
|
||
| diskToCreate.AccessMode = accessMode | ||
| var insertOp *computebeta.Operation | ||
| diskToCreate.MultiWriter = multiWriter | ||
| insertOp, err = cloud.betaService.Disks.Insert(project, volKey.Zone, diskToCreate).Context(ctx).Do() | ||
| if insertOp != nil { | ||
| opName = insertOp.Name | ||
| } | ||
|
|
||
| if err != nil { | ||
| if IsGCEError(err, "alreadyExists") { | ||
| disk, err := cloud.GetDisk(ctx, project, volKey) | ||
| if err != nil { | ||
| // failed to GetDisk, however the Disk may already exist | ||
| // the error code should be non-Final | ||
|
|
@@ -887,7 +838,7 @@ func (cloud *CloudProvider) insertZonalDisk( | |
| // failed to wait for Op to finish, however, the Op possibly is still running as expected | ||
| // the error code returned should be non-final | ||
| if IsGCEError(err, "alreadyExists") { | ||
| disk, err := cloud.GetDisk(ctx, project, volKey) | ||
| if err != nil { | ||
| return common.NewTemporaryError(codes.Unavailable, fmt.Errorf("error when getting disk: %w", err)) | ||
| } | ||
|
|
@@ -1186,7 +1137,7 @@ func (cloud *CloudProvider) waitForAttachOnDisk(ctx context.Context, project str | |
| start := time.Now() | ||
| return wait.ExponentialBackoff(AttachDiskBackoff, func() (bool, error) { | ||
| klog.V(6).Infof("Polling disks.get for attach of disk %v to instance %v to complete for %v", volKey.Name, instanceName, time.Since(start)) | ||
| disk, err := cloud.GetDisk(ctx, project, volKey) | ||
| if err != nil { | ||
| return false, fmt.Errorf("GetDisk failed to get disk: %w", err) | ||
| } | ||
|
|
@@ -1436,7 +1387,7 @@ func (cloud *CloudProvider) DeleteImage(ctx context.Context, project, imageName | |
| // k8s.io/apimachinery/quantity package for better size handling | ||
| func (cloud *CloudProvider) ResizeDisk(ctx context.Context, project string, volKey *meta.Key, requestBytes int64) (int64, error) { | ||
| klog.V(5).Infof("Resizing disk %v to size %v", volKey, requestBytes) | ||
| cloudDisk, err := cloud.GetDisk(ctx, project, volKey) | ||
| if err != nil { | ||
| return -1, fmt.Errorf("failed to get disk: %w", err) | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need to keep this check, to validate that we aren't trying to use a non-multiwriter disk when we need a multiwriter one?