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

rbd: rename deleteImage() to Delete()

Browse Source 
Renaming the `Delete()` function makes it easier to implement the
upcoming `Volume` interface.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2024-07-05 08:46:09 +02:00 committed by mergify[bot]
parent 6b5ef1d76a
commit 8d5e1aad4e
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rbd/clone.go
View File

@ -141,7 +141,7 @@ func (rv *rbdVolume) createCloneFromImage(ctx context.Context, parentVol *rbdVol
defer func() { defer func() {
if err != nil { if err != nil {
log.DebugLog(ctx, "Removing clone image %q", rv) log.DebugLog(ctx, "Removing clone image %q", rv)
errDefer := rv.deleteImage(ctx) errDefer := rv.Delete(ctx)
if errDefer != nil { if errDefer != nil {
log.ErrorLog(ctx, "failed to delete clone image %q: %v", rv, errDefer) log.ErrorLog(ctx, "failed to delete clone image %q: %v", rv, errDefer)
} }

12
internal/rbd/controllerserver.go
View File

@ -403,7 +403,7 @@ func (cs *ControllerServer) CreateVolume(
metadata := k8s.GetVolumeMetadata(req.GetParameters()) metadata := k8s.GetVolumeMetadata(req.GetParameters())
err = rbdVol.setAllMetadata(metadata) err = rbdVol.setAllMetadata(metadata)
if err != nil { if err != nil {
if deleteErr := rbdVol.deleteImage(ctx); deleteErr != nil { if deleteErr := rbdVol.Delete(ctx); deleteErr != nil {
log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v", rbdVol, deleteErr) log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v", rbdVol, deleteErr)
} }
@ -621,7 +621,7 @@ func checkFlatten(ctx context.Context, rbdVol *rbdVolume, cr *util.Credentials)
if errors.Is(err, ErrFlattenInProgress) { if errors.Is(err, ErrFlattenInProgress) {
return status.Error(codes.Aborted, err.Error()) return status.Error(codes.Aborted, err.Error())
} }
if errDefer := rbdVol.deleteImage(ctx); errDefer != nil { if errDefer := rbdVol.Delete(ctx); errDefer != nil {
log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v", rbdVol, errDefer) log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v", rbdVol, errDefer)
return status.Error(codes.Internal, err.Error()) return status.Error(codes.Internal, err.Error())
@ -681,7 +681,7 @@ func (cs *ControllerServer) createVolumeFromSnapshot(
defer func() { defer func() {
if err != nil { if err != nil {
log.DebugLog(ctx, "Removing clone image %q", rbdVol) log.DebugLog(ctx, "Removing clone image %q", rbdVol)
errDefer := rbdVol.deleteImage(ctx) errDefer := rbdVol.Delete(ctx)
if errDefer != nil { if errDefer != nil {
log.ErrorLog(ctx, "failed to delete clone image %q: %v", rbdVol, errDefer) log.ErrorLog(ctx, "failed to delete clone image %q: %v", rbdVol, errDefer)
} }
@ -764,7 +764,7 @@ func (cs *ControllerServer) createBackingImage(
defer func() { defer func() {
if err != nil { if err != nil {
if deleteErr := rbdVol.deleteImage(ctx); deleteErr != nil { if deleteErr := rbdVol.Delete(ctx); deleteErr != nil {
log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v", rbdVol, deleteErr) log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v", rbdVol, deleteErr)
} }
} }
@ -1029,7 +1029,7 @@ func cleanupRBDImage(ctx context.Context,
// Deleting rbd image // Deleting rbd image
log.DebugLog(ctx, "deleting image %s", rbdVol.RbdImageName) log.DebugLog(ctx, "deleting image %s", rbdVol.RbdImageName)
if err = rbdVol.deleteImage(ctx); err != nil { if err = rbdVol.Delete(ctx); err != nil {
log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v", log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v",
rbdVol, err) rbdVol, err)
@ -1188,7 +1188,7 @@ func (cs *ControllerServer) CreateSnapshot(
defer func() { defer func() {
if err != nil { if err != nil {
log.DebugLog(ctx, "Removing clone image %q", rbdVol) log.DebugLog(ctx, "Removing clone image %q", rbdVol)
errDefer := rbdVol.deleteImage(ctx) errDefer := rbdVol.Delete(ctx)
if errDefer != nil { if errDefer != nil {
log.ErrorLog(ctx, "failed to delete clone image %q: %v", rbdVol, errDefer) log.ErrorLog(ctx, "failed to delete clone image %q: %v", rbdVol, errDefer)
} }

2
internal/rbd/migration.go
View File

@ -82,7 +82,7 @@ func deleteMigratedVolume(ctx context.Context, parsedMigHandle *migrationVolID,
return err return err
} }
defer rv.Destroy(ctx) defer rv.Destroy(ctx)
err = rv.deleteImage(ctx) err = rv.Delete(ctx)
if err != nil { if err != nil {
log.ErrorLog(ctx, "failed to delete rbd image: %s, err: %v", rv, err) log.ErrorLog(ctx, "failed to delete rbd image: %s, err: %v", rv, err)
} }

6
internal/rbd/rbd_util.go
View File

@ -627,8 +627,8 @@ func (ri *rbdImage) ensureImageCleanup(ctx context.Context) error {
return nil return nil
} }
// deleteImage deletes a ceph image with provision and volume options. // Delete deletes a ceph image with provision and volume options.
func (ri *rbdImage) deleteImage(ctx context.Context) error { func (ri *rbdImage) Delete(ctx context.Context) error {
image := ri.RbdImageName image := ri.RbdImageName
log.DebugLog(ctx, "rbd: delete %s using mon %s, pool %s", image, ri.Monitors, ri.Pool) log.DebugLog(ctx, "rbd: delete %s using mon %s, pool %s", image, ri.Monitors, ri.Pool)
@ -706,7 +706,7 @@ func (ri *rbdImage) trashRemoveImage(ctx context.Context) error {
// DeleteTempImage deletes the temporary image created for volume datasource. // DeleteTempImage deletes the temporary image created for volume datasource.
func (rv *rbdVolume) DeleteTempImage(ctx context.Context) error { func (rv *rbdVolume) DeleteTempImage(ctx context.Context) error {
tempClone := rv.generateTempClone() tempClone := rv.generateTempClone()
err := tempClone.deleteImage(ctx) err := tempClone.Delete(ctx)
if err != nil { if err != nil {
if errors.Is(err, ErrImageNotFound) { if errors.Is(err, ErrImageNotFound) {
return tempClone.ensureImageCleanup(ctx) return tempClone.ensureImageCleanup(ctx)

4
internal/rbd/snapshot.go
View File

@ -56,7 +56,7 @@ func createRBDClone(
errSnap := parentVol.deleteSnapshot(ctx, snap) errSnap := parentVol.deleteSnapshot(ctx, snap)
if errSnap != nil { if errSnap != nil {
log.ErrorLog(ctx, "failed to delete snapshot: %v", errSnap) log.ErrorLog(ctx, "failed to delete snapshot: %v", errSnap)
delErr := cloneRbdVol.deleteImage(ctx) delErr := cloneRbdVol.Delete(ctx)
if delErr != nil { if delErr != nil {
log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v", cloneRbdVol, delErr) log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v", cloneRbdVol, delErr)
} }
@ -85,7 +85,7 @@ func cleanUpSnapshot(
} }
if rbdVol != nil { if rbdVol != nil {
err := rbdVol.deleteImage(ctx) err := rbdVol.Delete(ctx)
if err != nil { if err != nil {
if !errors.Is(err, ErrImageNotFound) { if !errors.Is(err, ErrImageNotFound) {
log.ErrorLog(ctx, "failed to delete rbd image %q with error: %v", rbdVol, err) log.ErrorLog(ctx, "failed to delete rbd image %q with error: %v", rbdVol, err)