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

cleanup: use switch/case for genVolFromVolID() error checking

Browse Source 
By using switch/case it is easier to follow the error checking of the
genVolFromVolID() function. In case a new error is added as a return of
the function, it will be simpler to add checking for it.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-05-11 10:48:52 +02:00 committed by mergify[bot]
parent 25ea25368a
commit f889dc20bd
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
internal/rbd/controllerserver.go
View File

@ -395,14 +395,14 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
rbdVol, err := genVolFromVolID(ctx, volumeID, cr, req.GetSecrets()) rbdVol, err := genVolFromVolID(ctx, volumeID, cr, req.GetSecrets())
if err != nil { if err != nil {
if _, ok := err.(util.ErrPoolNotFound); ok { switch err.(type) {
case util.ErrPoolNotFound:
klog.Warningf(util.Log(ctx, "failed to get backend volume for %s: %v"), volumeID, err) klog.Warningf(util.Log(ctx, "failed to get backend volume for %s: %v"), volumeID, err)
return &csi.DeleteVolumeResponse{}, nil return &csi.DeleteVolumeResponse{}, nil
}
// If error is ErrInvalidVolID it could be a version 1.0.0 or lower volume, attempt // If error is ErrInvalidVolID it could be a version 1.0.0 or lower volume, attempt
// to process it as such // to process it as such
if _, ok := err.(ErrInvalidVolID); ok { case ErrInvalidVolID:
if isLegacyVolumeID(volumeID) { if isLegacyVolumeID(volumeID) {
klog.V(2).Infof(util.Log(ctx, "attempting deletion of potential legacy volume (%s)"), volumeID) klog.V(2).Infof(util.Log(ctx, "attempting deletion of potential legacy volume (%s)"), volumeID)
return cs.DeleteLegacyVolume(ctx, req, cr) return cs.DeleteLegacyVolume(ctx, req, cr)
@ -410,18 +410,18 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
// Consider unknown volumeID as a successfully deleted volume // Consider unknown volumeID as a successfully deleted volume
return &csi.DeleteVolumeResponse{}, nil return &csi.DeleteVolumeResponse{}, nil
}
// if error is ErrKeyNotFound, then a previous attempt at deletion was complete // if error is ErrKeyNotFound, then a previous attempt at deletion was complete
// or partially complete (image and imageOMap are garbage collected already), hence return // or partially complete (image and imageOMap are garbage collected already), hence return
// success as deletion is complete // success as deletion is complete
if _, ok := err.(util.ErrKeyNotFound); ok { case util.ErrKeyNotFound:
klog.Warningf(util.Log(ctx, "Failed to volume options for %s: %v"), volumeID, err) klog.Warningf(util.Log(ctx, "Failed to volume options for %s: %v"), volumeID, err)
return &csi.DeleteVolumeResponse{}, nil return &csi.DeleteVolumeResponse{}, nil
}
// All errors other than ErrImageNotFound should return an error back to the caller // All errors other than ErrImageNotFound should return an error back to the caller
if _, ok := err.(ErrImageNotFound); !ok { case ErrImageNotFound:
break
default:
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }
@ -512,15 +512,16 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
// Fetch source volume information // Fetch source volume information
rbdVol, err := genVolFromVolID(ctx, req.GetSourceVolumeId(), cr, req.GetSecrets()) rbdVol, err := genVolFromVolID(ctx, req.GetSourceVolumeId(), cr, req.GetSecrets())
if err != nil { if err != nil {
if _, ok := err.(ErrImageNotFound); ok { switch err.(type) {
return nil, status.Errorf(codes.NotFound, "source Volume ID %s not found", req.GetSourceVolumeId()) case ErrImageNotFound:
} err = status.Errorf(codes.NotFound, "source Volume ID %s not found", req.GetSourceVolumeId())
case util.ErrPoolNotFound:
if _, ok := err.(util.ErrPoolNotFound); ok {
klog.Errorf(util.Log(ctx, "failed to get backend volume for %s: %v"), req.GetSourceVolumeId(), err) klog.Errorf(util.Log(ctx, "failed to get backend volume for %s: %v"), req.GetSourceVolumeId(), err)
return nil, status.Errorf(codes.Internal, err.Error()) err = status.Errorf(codes.NotFound, err.Error())
default:
err = status.Errorf(codes.Internal, err.Error())
} }
return nil, status.Errorf(codes.Internal, err.Error()) return nil, err
} }
defer rbdVol.Destroy() defer rbdVol.Destroy()
@ -786,16 +787,16 @@ func (cs *ControllerServer) ControllerExpandVolume(ctx context.Context, req *csi
rbdVol, err := genVolFromVolID(ctx, volID, cr, req.GetSecrets()) rbdVol, err := genVolFromVolID(ctx, volID, cr, req.GetSecrets())
if err != nil { if err != nil {
if _, ok := err.(ErrImageNotFound); ok { switch err.(type) {
return nil, status.Errorf(codes.NotFound, "volume ID %s not found", volID) case ErrImageNotFound:
} err = status.Errorf(codes.NotFound, "volume ID %s not found", volID)
case util.ErrPoolNotFound:
if _, ok := err.(util.ErrPoolNotFound); ok {
klog.Errorf(util.Log(ctx, "failed to get backend volume for %s: %v"), volID, err) klog.Errorf(util.Log(ctx, "failed to get backend volume for %s: %v"), volID, err)
return nil, status.Errorf(codes.InvalidArgument, err.Error()) err = status.Errorf(codes.NotFound, err.Error())
default:
err = status.Errorf(codes.Internal, err.Error())
} }
return nil, err
return nil, status.Errorf(codes.Internal, err.Error())
} }
defer rbdVol.Destroy() defer rbdVol.Destroy()