diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go index da464ad53..87819ab79 100644 --- a/internal/rbd/controllerserver.go +++ b/internal/rbd/controllerserver.go @@ -1447,9 +1447,7 @@ func (cs *ControllerServer) ControllerExpandVolume( return nil, status.Error(codes.InvalidArgument, err.Error()) } defer cr.DeleteCredentials() - - rbdVol, err := GenVolFromVolID(ctx, volID, cr, req.GetSecrets()) - defer rbdVol.Destroy() + rbdVol, err := genVolFromVolIDWithMigration(ctx, volID, cr, req.GetSecrets()) if err != nil { switch { case errors.Is(err, ErrImageNotFound): @@ -1463,6 +1461,7 @@ func (cs *ControllerServer) ControllerExpandVolume( return nil, err } + defer rbdVol.Destroy() // NodeExpansion is needed for PersistentVolumes with, // 1. Filesystem VolumeMode with & without Encryption and diff --git a/internal/rbd/migration.go b/internal/rbd/migration.go index ca8c48e4c..d021514a9 100644 --- a/internal/rbd/migration.go +++ b/internal/rbd/migration.go @@ -77,35 +77,41 @@ func parseMigrationVolID(vh string) (*migrationVolID, error) { // deleteMigratedVolume get rbd volume details from the migration volID // and delete the volume from the cluster, return err if there was an error on the process. func deleteMigratedVolume(ctx context.Context, parsedMigHandle *migrationVolID, cr *util.Credentials) error { + rv, err := genVolFromMigVolID(ctx, parsedMigHandle, cr) + if err != nil { + return err + } + defer rv.Destroy() + err = deleteImage(ctx, rv, cr) + if err != nil { + log.ErrorLog(ctx, "failed to delete rbd image: %s, err: %v", rv, err) + } + + return err +} + +// genVolFromMigVolID populate rbdVol struct from the migration volID. +func genVolFromMigVolID(ctx context.Context, migVolID *migrationVolID, cr *util.Credentials) (*rbdVolume, error) { var err error rv := &rbdVolume{} // fill details to rv struct from parsed migration handle - rv.RbdImageName = parsedMigHandle.imageName - rv.Pool = parsedMigHandle.poolName - rv.ClusterID = parsedMigHandle.clusterID + rv.RbdImageName = migVolID.imageName + rv.Pool = migVolID.poolName + rv.ClusterID = migVolID.clusterID rv.Monitors, err = util.Mons(util.CsiConfigFile, rv.ClusterID) if err != nil { log.ErrorLog(ctx, "failed to fetch monitors using clusterID: %s, err: %v", rv.ClusterID, err) - return err + return nil, err } - // connect to the volume. err = rv.Connect(cr) if err != nil { log.ErrorLog(ctx, "failed to get connected to the rbd image : %s, err: %v", rv.RbdImageName, err) - return err - } - defer rv.Destroy() - // if connected , delete it - err = deleteImage(ctx, rv, cr) - if err != nil { - log.ErrorLog(ctx, "failed to delete rbd image : %s, err: %v", rv.RbdImageName, err) - - return err + return nil, err } - return nil + return rv, nil } diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index ef3a15416..9fc149d14 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -2071,3 +2071,22 @@ func strategicActionOnLogFile(ctx context.Context, logStrategy, logFile string) log.ErrorLog(ctx, "unknown cephLogStrategy option %q: hint: 'remove'|'compress'|'preserve'", logStrategy) } } + +// genVolFromVolIDWithMigration populate a rbdVol structure based on the volID format. +func genVolFromVolIDWithMigration( + ctx context.Context, volID string, cr *util.Credentials, secrets map[string]string) (*rbdVolume, error) { + if isMigrationVolID(volID) { + pmVolID, pErr := parseMigrationVolID(volID) + if pErr != nil { + return nil, pErr + } + + return genVolFromMigVolID(ctx, pmVolID, cr) + } + rv, err := GenVolFromVolID(ctx, volID, cr, secrets) + if err != nil { + rv.Destroy() + } + + return rv, err +}