[csi-manila] fixed incorrect behaviour discovered by csi-sanity test suite #730
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,7 +79,11 @@ func (ns *nodeServer) buildVolumeContext(volID volumeID, shareOpts *options.Node | |
| } | ||
|
|
||
| if share.Status != shareAvailable { | ||
| if share.Status == shareCreating { | ||
| return nil, nil, status.Errorf(codes.Unavailable, "share %s for volume %s is in transient creating state", share.ID, volID) | ||
| } | ||
|
|
||
| return nil, nil, status.Errorf(codes.FailedPrecondition, "invalid share status for volume %s (share ID %s): expected 'available', got '%s'", | ||
| volID, share.ID, share.Status) | ||
| } | ||
|
|
||
|
|
@@ -156,12 +160,12 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis | |
|
|
||
| shareOpts, err := options.NewNodeVolumeContext(req.GetVolumeContext()) | ||
| if err != nil { | ||
| return nil, status.Errorf(codes.InvalidArgument, "invalid volume context: %v", err) | ||
| } | ||
|
|
||
| osOpts, err := options.NewOpenstackOptions(req.GetSecrets()) | ||
| if err != nil { | ||
| return nil, status.Errorf(codes.InvalidArgument, "invalid OpenStack secrets: %v", err) | ||
| } | ||
|
|
||
| volID := volumeID(req.GetVolumeId()) | ||
|
|
@@ -240,12 +244,12 @@ func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol | |
|
|
||
| shareOpts, err := options.NewNodeVolumeContext(req.GetVolumeContext()) | ||
| if err != nil { | ||
| return nil, status.Errorf(codes.InvalidArgument, "invalid volume context: %v", err) | ||
| } | ||
|
|
||
| osOpts, err := options.NewOpenstackOptions(req.GetSecrets()) | ||
| if err != nil { | ||
| return nil, status.Errorf(codes.InvalidArgument, "invalid OpenStack secrets: %v", err) | ||
| } | ||
|
|
||
| volID := volumeID(req.GetVolumeId()) | ||
|
Contributor
There was a problem hiding this comment. we need to check if specified volume exists or not here also?
Contributor
Author
There was a problem hiding this comment. It's already being checked in
Contributor
Author
There was a problem hiding this comment. ...which returns |
||
|
|
||
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 |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ import ( | |
| "strings" | ||
|
|
||
| "github.com/container-storage-interface/spec/lib/go/csi" | ||
| "github.com/gophercloud/gophercloud" | ||
| "github.com/gophercloud/gophercloud/openstack/sharedfilesystems/v2/messages" | ||
| "github.com/gophercloud/gophercloud/openstack/sharedfilesystems/v2/shares" | ||
| "github.com/gophercloud/gophercloud/openstack/sharedfilesystems/v2/snapshots" | ||
|
|
@@ -176,6 +177,26 @@ func lastResourceError(resourceID string, manilaClient manilaclient.Interface) ( | |
| return manilaErrorMessage{message: "unknown error"}, nil | ||
| } | ||
|
|
||
| func isManilaErrNotFound(err error) bool { | ||
|
Contributor
There was a problem hiding this comment. we already have IsNotFound error defined here , you can reuse it the same https://github.com/kubernetes/cloud-provider-openstack/blob/master/pkg/util/errors/errors.go#L25
Contributor
Author
There was a problem hiding this comment. Thanks for pointing this out! Will update |
||
| if err == nil { | ||
| return false | ||
| } | ||
|
|
||
| if _, isDefault404 := err.(gophercloud.ErrDefault404); isDefault404 { | ||
| return true | ||
| } | ||
|
|
||
| if _, isResourceNotFound := err.(gophercloud.ErrResourceNotFound); isResourceNotFound { | ||
| return true | ||
| } | ||
|
|
||
| return false | ||
| } | ||
|
|
||
| func compareProtocol(protoA, protoB string) bool { | ||
| return strings.ToUpper(protoA) == strings.ToUpper(protoB) | ||
| } | ||
|
|
||
| // | ||
| // Controller service request validation | ||
| // | ||
|
|
@@ -192,7 +213,7 @@ func validateCreateVolumeRequest(req *csi.CreateVolumeRequest) error { | |
|
|
||
| for _, cap := range reqCaps { | ||
| if cap.GetBlock() != nil { | ||
| return errors.New("block access type not allowed") | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -257,11 +278,11 @@ func verifyVolumeCompatibility(sizeInGiB int, req *csi.CreateVolumeRequest, shar | |
| } | ||
|
|
||
| if share.Size != sizeInGiB { | ||
| return fmt.Errorf("size mismatch: wanted %d, got %d", share.Size, sizeInGiB) | ||
| } | ||
|
|
||
| if share.ShareProto != shareOpts.Protocol { | ||
| return fmt.Errorf("share protocol mismatch: wanted %s, got %s", coalesceValue(share.ShareProto), coalesceValue(shareOpts.Protocol)) | ||
| } | ||
|
|
||
| // FIXME shareOpts.Type may be either type name or type ID | ||
|
|
@@ -272,7 +293,7 @@ func verifyVolumeCompatibility(sizeInGiB int, req *csi.CreateVolumeRequest, shar | |
| */ | ||
|
|
||
| if share.ShareNetworkID != shareOpts.ShareNetworkID { | ||
| return fmt.Errorf("share network ID mismatch: wanted %s, got %s", coalesceValue(share.ShareNetworkID), coalesceValue(shareOpts.ShareNetworkID)) | ||
| } | ||
|
|
||
| var reqSrcSnapID string | ||
|
|
@@ -287,9 +308,25 @@ func verifyVolumeCompatibility(sizeInGiB int, req *csi.CreateVolumeRequest, shar | |
| return nil | ||
| } | ||
|
|
||
| func verifySnapshotCompatibility(snapshot *snapshots.Snapshot, req *csi.CreateSnapshotRequest) error { | ||
| if snapshot.ShareID != req.GetSourceVolumeId() { | ||
| return fmt.Errorf("source share ID mismatch: wanted %s, got %s", snapshot.ID, req.GetSourceVolumeId()) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func validateValidateVolumeCapabilitiesRequest(req *csi.ValidateVolumeCapabilitiesRequest) error { | ||
| if req.GetVolumeId() == "" { | ||
| return errors.New("volume ID missing in request") | ||
| } | ||
|
|
||
| if req.GetVolumeCapabilities() == nil || len(req.GetVolumeCapabilities()) == 0 { | ||
| return errors.New("volume capabilities cannot be nil or empty") | ||
| } | ||
|
|
||
| if req.GetSecrets() == nil || len(req.GetSecrets()) == 0 { | ||
| return errors.New("stage secrets cannot be nil or empty") | ||
| } | ||
|
|
||
| return nil | ||
|
|
@@ -320,6 +357,10 @@ func validateNodeStageVolumeRequest(req *csi.NodeStageVolumeRequest) error { | |
| } | ||
|
|
||
| func validateNodeUnstageVolumeRequest(req *csi.NodeUnstageVolumeRequest) error { | ||
| if req.GetStagingTargetPath() == "" { | ||
| return errors.New("staging path missing in request") | ||
| } | ||
|
|
||
| if req.GetVolumeId() == "" { | ||
| return errors.New("volume ID missing in request") | ||
| } | ||
|
|
@@ -348,6 +389,10 @@ func validateNodePublishVolumeRequest(req *csi.NodePublishVolumeRequest) error { | |
| } | ||
|
|
||
| func validateNodeUnpublishVolumeRequest(req *csi.NodeUnpublishVolumeRequest) error { | ||
| if req.GetTargetPath() == "" { | ||
| return errors.New("target path missing in request") | ||
| } | ||
|
|
||
| if req.GetVolumeId() == "" { | ||
| return errors.New("volume ID missing in request") | ||
| } | ||
|
|
||
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
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.
ditto