mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 16:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #249 from Madhu-1/fix-return

Browse Source 
Fix return error codes
This commit is contained in:
Róbert Vašek 2019-03-12 17:25:05 +01:00 committed by GitHub
commit 2a25666109
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/rbd/controllerserver.go
View File

@ -32,6 +32,7 @@ import (
"github.com/golang/protobuf/ptypes/timestamp" "github.com/golang/protobuf/ptypes/timestamp"
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer" "github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
"github.com/pborman/uuid" "github.com/pborman/uuid"
"github.com/pkg/errors"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
@ -104,7 +105,7 @@ func parseVolCreateRequest(req *csi.CreateVolumeRequest) (*rbdVolume, error) {
rbdVol, err := getRBDVolumeOptions(req.GetParameters(), disableMultiWriter) rbdVol, err := getRBDVolumeOptions(req.GetParameters(), disableMultiWriter)
if err != nil { if err != nil {
return nil, err return nil, status.Error(codes.InvalidArgument, err.Error())
} }
// Generating Volume Name and Volume ID, as according to CSI spec they MUST be different // Generating Volume Name and Volume ID, as according to CSI spec they MUST be different
@ -215,7 +216,7 @@ func (cs *ControllerServer) checkRBDStatus(rbdVol *rbdVolume, req *csi.CreateVol
err = createRBDImage(rbdVol, volSizeMiB, rbdVol.AdminID, req.GetSecrets()) err = createRBDImage(rbdVol, volSizeMiB, rbdVol.AdminID, req.GetSecrets())
if err != nil { if err != nil {
klog.Warningf("failed to create volume: %v", err) klog.Warningf("failed to create volume: %v", err)
return err return status.Error(codes.Internal, err.Error())
} }
klog.V(4).Infof("create volume %s", rbdVol.VolName) klog.V(4).Infof("create volume %s", rbdVol.VolName)
@ -236,12 +237,12 @@ func (cs *ControllerServer) checkSnapshot(req *csi.CreateVolumeRequest, rbdVol *
rbdSnap := &rbdSnapshot{} rbdSnap := &rbdSnapshot{}
if err := cs.MetadataStore.Get(snapshotID, rbdSnap); err != nil { if err := cs.MetadataStore.Get(snapshotID, rbdSnap); err != nil {
return err return status.Error(codes.NotFound, err.Error())
} }
err := restoreSnapshot(rbdVol, rbdSnap, rbdVol.AdminID, req.GetSecrets()) err := restoreSnapshot(rbdVol, rbdSnap, rbdVol.AdminID, req.GetSecrets())
if err != nil { if err != nil {
return err return status.Error(codes.Internal, err.Error())
} }
klog.V(4).Infof("create volume %s from snapshot %s", req.GetName(), rbdSnap.SnapName) klog.V(4).Infof("create volume %s from snapshot %s", req.GetName(), rbdSnap.SnapName)
return nil return nil
@ -280,11 +281,11 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
if err := deleteRBDImage(rbdVol, rbdVol.AdminID, req.GetSecrets()); err != nil { if err := deleteRBDImage(rbdVol, rbdVol.AdminID, req.GetSecrets()); err != nil {
// TODO: can we detect "already deleted" situations here and proceed? // TODO: can we detect "already deleted" situations here and proceed?
klog.V(3).Infof("failed to delete rbd image: %s/%s with error: %v", rbdVol.Pool, volName, err) klog.V(3).Infof("failed to delete rbd image: %s/%s with error: %v", rbdVol.Pool, volName, err)
return nil, err return nil, status.Error(codes.Internal, err.Error())
} }
if err := cs.MetadataStore.Delete(volumeID); err != nil { if err := cs.MetadataStore.Delete(volumeID); err != nil {
return nil, err return nil, status.Error(codes.Internal, err.Error())
} }
delete(rbdVolumes, volumeID) delete(rbdVolumes, volumeID)
@ -415,7 +416,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
rbdSnap, err := getRBDSnapshotOptions(req.GetParameters()) rbdSnap, err := getRBDSnapshotOptions(req.GetParameters())
if err != nil { if err != nil {
return nil, err return nil, status.Error(codes.InvalidArgument, err.Error())
} }
// Generating Snapshot Name and Snapshot ID, as according to CSI spec they MUST be different // Generating Snapshot Name and Snapshot ID, as according to CSI spec they MUST be different
@ -426,7 +427,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
return nil, status.Errorf(codes.NotFound, "Source Volume ID %s cannot found", req.GetSourceVolumeId()) return nil, status.Errorf(codes.NotFound, "Source Volume ID %s cannot found", req.GetSourceVolumeId())
} }
if !hasSnapshotFeature(rbdVolume.ImageFeatures) { if !hasSnapshotFeature(rbdVolume.ImageFeatures) {
return nil, fmt.Errorf("volume(%s) has not snapshot feature(layering)", req.GetSourceVolumeId()) return nil, status.Errorf(codes.InvalidArgument, "volume(%s) has not snapshot feature(layering)", req.GetSourceVolumeId())
} }
rbdSnap.VolName = rbdVolume.VolName rbdSnap.VolName = rbdVolume.VolName
@ -439,7 +440,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
err = cs.doSnapshot(rbdSnap, req.GetSecrets()) err = cs.doSnapshot(rbdSnap, req.GetSecrets())
// if we already have the snapshot, return the snapshot // if we already have the snapshot, return the snapshot
if err != nil { if err != nil {
return nil, err return nil, status.Error(codes.Internal, err.Error())
} }
rbdSnap.CreatedAt = ptypes.TimestampNow().GetSeconds() rbdSnap.CreatedAt = ptypes.TimestampNow().GetSeconds()
@ -517,7 +518,7 @@ func (cs *ControllerServer) doSnapshot(rbdSnap *rbdSnapshot, secret map[string]s
if err != nil { if err != nil {
return fmt.Errorf("snapshot is created but failed to protect and delete snapshot: %v", err) return fmt.Errorf("snapshot is created but failed to protect and delete snapshot: %v", err)
} }
return fmt.Errorf("snapshot is created but failed to protect snapshot") return errors.New("snapshot is created but failed to protect snapshot")
} }
} }
return nil return nil
@ -566,7 +567,7 @@ func (cs *ControllerServer) DeleteSnapshot(ctx context.Context, req *csi.DeleteS
} }
if err := cs.MetadataStore.Delete(snapshotID); err != nil { if err := cs.MetadataStore.Delete(snapshotID); err != nil {
return nil, err return nil, status.Error(codes.Internal, err.Error())
} }
delete(rbdSnapshots, snapshotID) delete(rbdSnapshots, snapshotID)

8
pkg/rbd/rbd_util.go
View File

@ -232,13 +232,13 @@ func getRBDVolumeOptions(volOptions map[string]string, ignoreMultiNodeWritable b
rbdVol := &rbdVolume{} rbdVol := &rbdVolume{}
rbdVol.Pool, ok = volOptions["pool"] rbdVol.Pool, ok = volOptions["pool"]
if !ok { if !ok {
return nil, fmt.Errorf("missing required parameter pool") return nil, errors.New("missing required parameter pool")
} }
rbdVol.Monitors, ok = volOptions["monitors"] rbdVol.Monitors, ok = volOptions["monitors"]
if !ok { if !ok {
// if mons are not set in options, check if they are set in secret // if mons are not set in options, check if they are set in secret
if rbdVol.MonValueFromSecret, ok = volOptions["monValueFromSecret"]; !ok { if rbdVol.MonValueFromSecret, ok = volOptions["monValueFromSecret"]; !ok {
return nil, fmt.Errorf("either monitors or monValueFromSecret must be set") return nil, errors.New("either monitors or monValueFromSecret must be set")
} }
} }
rbdVol.ImageFormat, ok = volOptions["imageFormat"] rbdVol.ImageFormat, ok = volOptions["imageFormat"]
@ -290,13 +290,13 @@ func getRBDSnapshotOptions(snapOptions map[string]string) (*rbdSnapshot, error)
rbdSnap := &rbdSnapshot{} rbdSnap := &rbdSnapshot{}
rbdSnap.Pool, ok = snapOptions["pool"] rbdSnap.Pool, ok = snapOptions["pool"]
if !ok { if !ok {
return nil, fmt.Errorf("missing required parameter pool") return nil, errors.New("missing required parameter pool")
} }
rbdSnap.Monitors, ok = snapOptions["monitors"] rbdSnap.Monitors, ok = snapOptions["monitors"]
if !ok { if !ok {
// if mons are not set in options, check if they are set in secret // if mons are not set in options, check if they are set in secret
if rbdSnap.MonValueFromSecret, ok = snapOptions["monValueFromSecret"]; !ok { if rbdSnap.MonValueFromSecret, ok = snapOptions["monValueFromSecret"]; !ok {
return nil, fmt.Errorf("either monitors or monValueFromSecret must be set") return nil, errors.New("either monitors or monValueFromSecret must be set")
} }
} }
rbdSnap.AdminID, ok = snapOptions["adminid"] rbdSnap.AdminID, ok = snapOptions["adminid"]