mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-14 18:30:21 +00:00
rbd: cleanup inconsistent state in reserveSnap()
after a failure
`reserveSnap()` can potentially fail halfway through, in that case it needs to undo the snapshot reservation and restore modified attributes of the snapshot. Fixes: #4945 Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
parent
cea8bf8110
commit
f3d40f9e5a
@ -388,6 +388,18 @@ func (ri *rbdImage) repairImageID(ctx context.Context, j *journal.Connection, fo
|
|||||||
func reserveSnap(ctx context.Context, rbdSnap *rbdSnapshot, rbdVol *rbdVolume, cr *util.Credentials) error {
|
func reserveSnap(ctx context.Context, rbdSnap *rbdSnapshot, rbdVol *rbdVolume, cr *util.Credentials) error {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
// restore original values in case of an error
|
||||||
|
origReservedID := rbdSnap.ReservedID
|
||||||
|
origRbdSnapName := rbdSnap.RbdSnapName
|
||||||
|
origVolID := rbdSnap.VolID
|
||||||
|
defer func() {
|
||||||
|
if err != nil {
|
||||||
|
rbdSnap.ReservedID = origReservedID
|
||||||
|
rbdSnap.RbdSnapName = origRbdSnapName
|
||||||
|
rbdSnap.VolID = origVolID
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
journalPoolID, imagePoolID, err := util.GetPoolIDs(ctx, rbdSnap.Monitors, rbdSnap.JournalPool, rbdSnap.Pool, cr)
|
journalPoolID, imagePoolID, err := util.GetPoolIDs(ctx, rbdSnap.Monitors, rbdSnap.JournalPool, rbdSnap.Pool, cr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -405,6 +417,17 @@ func reserveSnap(ctx context.Context, rbdSnap *rbdSnapshot, rbdVol *rbdVolume, c
|
|||||||
ctx, rbdSnap.JournalPool, journalPoolID, rbdSnap.Pool, imagePoolID,
|
ctx, rbdSnap.JournalPool, journalPoolID, rbdSnap.Pool, imagePoolID,
|
||||||
rbdSnap.RequestName, rbdSnap.NamePrefix, rbdVol.RbdImageName, kmsID, rbdSnap.ReservedID, rbdVol.Owner,
|
rbdSnap.RequestName, rbdSnap.NamePrefix, rbdVol.RbdImageName, kmsID, rbdSnap.ReservedID, rbdVol.Owner,
|
||||||
"", encryptionType)
|
"", encryptionType)
|
||||||
|
defer func() {
|
||||||
|
// only undo the reservation when an error occurred
|
||||||
|
if err == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
undoErr := undoSnapReservation(ctx, rbdSnap, cr)
|
||||||
|
if undoErr != nil {
|
||||||
|
log.WarningLog(ctx, "failed undoing reservation of snapshot %q: %v", rbdSnap, undoErr)
|
||||||
|
}
|
||||||
|
}()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user