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

rbd: move setupEncryption() from buildCreateVolumeResponse to CreateVolume

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-04-01 13:18:28 +02:00 committed by mergify[bot]
parent bea9d56117
commit dc990037a5
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/rbd/clone.go
View File

@ -214,6 +214,12 @@ func (rv *rbdVolume) createCloneFromImage(ctx context.Context, parentVol *rbdVol
return err return err
} }
if parentVol.isEncrypted() {
err = parentVol.copyEncryptionConfig(&rv.rbdImage)
if err != nil {
return fmt.Errorf("failed to copy encryption config for %q: %w", rv, err)
}
}
err = j.StoreImageID(ctx, rv.JournalPool, rv.ReservedID, rv.ImageID) err = j.StoreImageID(ctx, rv.JournalPool, rv.ReservedID, rv.ImageID)
if err != nil { if err != nil {
util.ErrorLog(ctx, "failed to store volume %s: %v", rv, err) util.ErrorLog(ctx, "failed to store volume %s: %v", rv, err)

32
internal/rbd/controllerserver.go
View File

@ -152,15 +152,7 @@ func (cs *ControllerServer) parseVolCreateRequest(ctx context.Context, req *csi.
return rbdVol, nil return rbdVol, nil
} }
func buildCreateVolumeResponse(ctx context.Context, req *csi.CreateVolumeRequest, rbdVol *rbdVolume) (*csi.CreateVolumeResponse, error) { func buildCreateVolumeResponse(req *csi.CreateVolumeRequest, rbdVol *rbdVolume) *csi.CreateVolumeResponse {
if rbdVol.isEncrypted() {
err := rbdVol.setupEncryption(ctx)
if err != nil {
util.ErrorLog(ctx, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
}
volumeContext := req.GetParameters() volumeContext := req.GetParameters()
volumeContext["pool"] = rbdVol.Pool volumeContext["pool"] = rbdVol.Pool
volumeContext["journalPool"] = rbdVol.JournalPool volumeContext["journalPool"] = rbdVol.JournalPool
@ -182,7 +174,7 @@ func buildCreateVolumeResponse(ctx context.Context, req *csi.CreateVolumeRequest
}, },
} }
} }
return &csi.CreateVolumeResponse{Volume: volume}, nil return &csi.CreateVolumeResponse{Volume: volume}
} }
// getGRPCErrorForCreateVolume converts the returns the GRPC errors based on // getGRPCErrorForCreateVolume converts the returns the GRPC errors based on
@ -226,6 +218,7 @@ func validateRequestedVolumeSize(rbdVol, parentVol *rbdVolume, rbdSnap *rbdSnaps
} }
// CreateVolume creates the volume in backend. // CreateVolume creates the volume in backend.
// nolint:gocyclo // encrypted cloning/snapshots added more complexity, this needs to be addressed
func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse, error) { func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse, error) {
if err := cs.validateVolumeReq(ctx, req); err != nil { if err := cs.validateVolumeReq(ctx, req); err != nil {
return nil, err return nil, err
@ -266,6 +259,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
if err != nil { if err != nil {
return nil, getGRPCErrorForCreateVolume(err) return nil, getGRPCErrorForCreateVolume(err)
} }
if found { if found {
if rbdSnap != nil { if rbdSnap != nil {
// check if image depth is reached limit and requires flatten // check if image depth is reached limit and requires flatten
@ -274,7 +268,16 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
return nil, err return nil, err
} }
} }
return buildCreateVolumeResponse(ctx, req, rbdVol)
if parentVol != nil && parentVol.isEncrypted() {
err = parentVol.copyEncryptionConfig(&rbdVol.rbdImage)
if err != nil {
util.ErrorLog(ctx, err.Error())
return nil, status.Error(codes.Internal, err.Error())
}
}
return buildCreateVolumeResponse(req, rbdVol), nil
} }
err = validateRequestedVolumeSize(rbdVol, parentVol, rbdSnap, cr) err = validateRequestedVolumeSize(rbdVol, parentVol, rbdSnap, cr)
@ -516,13 +519,6 @@ func (cs *ControllerServer) createBackingImage(ctx context.Context, cr *util.Cre
return err return err
} }
} }
if rbdVol.isEncrypted() {
err = rbdVol.setupEncryption(ctx)
if err != nil {
util.ErrorLog(ctx, "failed to setup encroption for image %s: %v", rbdVol, err)
return status.Error(codes.Internal, err.Error())
}
}
return nil return nil
} }

7
internal/rbd/rbd_util.go
View File

@ -251,6 +251,13 @@ func createImage(ctx context.Context, pOpts *rbdVolume, cr *util.Credentials) er
return fmt.Errorf("failed to create rbd image: %w", err) return fmt.Errorf("failed to create rbd image: %w", err)
} }
if pOpts.isEncrypted() {
err = pOpts.setupEncryption(ctx)
if err != nil {
return fmt.Errorf("failed to setup encroption for image %s: %v", pOpts, err)
}
}
if pOpts.ThickProvision { if pOpts.ThickProvision {
err = pOpts.allocate(0) err = pOpts.allocate(0)
if err != nil { if err != nil {